Merge pull request #3656 from rmehta/sms-log
[fix] create SMS Log
diff --git a/.travis.yml b/.travis.yml
index ace0f7c..f6c4eee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,10 @@
services:
- mysql
+before_install:
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
+
install:
- sudo apt-get purge -y mysql-common
- wget https://raw.githubusercontent.com/frappe/bench/master/install_scripts/setup_frappe.sh
@@ -22,7 +26,9 @@
- bench use test_site
- bench reinstall
- bench build-website
- - bench --verbose run-tests
+ - bench serve &
+ - sleep 10
+ - bench --verbose run-tests --driver Firefox
before_script:
- mysql -e 'create database test_frappe'
@@ -33,6 +39,6 @@
webhooks:
urls:
- https://webhooks.gitter.im/e/92b3bea86d8c5397beef
- on_success: always
- on_failure: always
+ on_success: always
+ on_failure: always
on_start: never
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7a43823..9ef50d1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,9 @@
# Contributing to Frappe / ERPNext
+## Questions
+
+If you have questions on how to use ERPNext or want help in customization or debugging of your scripts, please post on https://discuss.frappe.io. This is only for bug reports and feature requests.
+
## Reporting issues
We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems. Please read the following guidelines before opening any issue.
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 7d2298f..ef61354 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '5.0.5'
+__version__ = '5.1.6'
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 77eaf65..8146c63 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -35,7 +35,7 @@
"permlevel": 0,
"read_only": 1,
"reqd": 1,
- "search_index": 1
+ "search_index": 0
},
{
"default": "0",
@@ -44,7 +44,7 @@
"label": "Is Group",
"permlevel": 0,
"precision": "",
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "company",
@@ -57,7 +57,7 @@
"permlevel": 0,
"read_only": 1,
"reqd": 1,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "root_type",
@@ -101,7 +101,7 @@
"label": "Account Type",
"oldfieldname": "account_type",
"oldfieldtype": "Select",
- "options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary",
+ "options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nRound Off\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary",
"permlevel": 0,
"search_index": 0
},
@@ -147,7 +147,8 @@
"label": "Lft",
"permlevel": 0,
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "rgt",
@@ -156,7 +157,8 @@
"label": "Rgt",
"permlevel": 0,
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "old_parent",
@@ -171,7 +173,7 @@
"icon": "icon-money",
"idx": 1,
"in_create": 0,
- "modified": "2015-04-27 20:07:37.147184",
+ "modified": "2015-06-14 20:57:55.471334",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
index eafc309..bea2c6d 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
@@ -1,6 +1,6 @@
{
"country_code": "ni",
- "name": "Catalogo de Cuentas",
+ "name": "Catalogo de Cuentas Nicaragua",
"is_active": "Yes",
"tree": {
"Activo": {
@@ -72,7 +72,7 @@
"IVA Acreditable por Importaciones": {
"account_type": "Tax"
},
- "IVA Acreditable por Prestacion de Servicios": {
+ "IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": {
"account_type": "Tax"
},
"Acreditacion Proporcional": {}
@@ -229,11 +229,19 @@
"Impuesto al Valor Agregado por Pagar": {
"account_type": "Tax"
},
- "Impuesto sobre la Renta": {
+ "Impuesto sobre la Renta por Actividades Economicas": {
"account_type": "Tax"
},
"Impuestos Municipales": {
- "account_type": "Tax"
+ "Impuesto Municipal Sobre Ingresos": {
+ "account_type": "Tax"
+ },
+ "Recoleccion Basura": {
+ "account_type": "Tax"
+ },
+ "Matricula Municipal": {
+ "account_type": "Tax"
+ }
}
},
"Retenciones por Pagar": {
@@ -241,7 +249,13 @@
"Retencion Rentas del Trabajo Tarifa Progresiva": {
"account_type": "Tax"
},
- "Retencion Definitiva por Rentas del Trabajo": {
+ "Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": {
"account_type": "Tax"
}
},
@@ -258,11 +272,26 @@
"Retencion 5% compra Madera en Rollo": {
"account_type": "Tax"
},
+ "Retencion Definitiva 1.5% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 3% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 10% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 15% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
"Otras Retenciones 10%": {
"account_type": "Tax"
}
},
"Rentas y Ganancias de Capital": {
+ "Retencion Defintiva 15% por Rentas de Capital": {
+ "account_type": "Tax"
+ },
"Retencion Defintiva 10% por Rentas de Capital": {
"account_type": "Tax"
},
@@ -272,10 +301,16 @@
"Retencion Definitiva 10% por Ganancia de Capital": {
"account_type": "Tax"
},
- "Retencion Definitiva Actividades Economicas No Residentes": {
+ "Retencion Definitiva 0.25% Transacciones Bursatiles": {
"account_type": "Tax"
},
- "Retencion Definitiva Transacciones Bursatiles": {
+ "Retencion Definitiva 1% Transacciones Bursatiles": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 1.5% Transacciones Bursatiles": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 2% Transacciones Bursatiles": {
"account_type": "Tax"
},
"Retenciones Defintiva 5% Fondos de Inversion": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
index dd3c067..481ada8 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
@@ -117,8 +117,8 @@
_("Print and Stationary"): {
"account_type": "Expense Account"
},
- _("Rounded Off"): {
- "account_type": "Expense Account"
+ _("Round Off"): {
+ "account_type": "Round Off"
},
_("Salary"): {
"account_type": "Expense Account"
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 9ef011b..cdb32dc 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -38,12 +38,19 @@
"label": "Credit Controller",
"options": "Role",
"permlevel": 0
+ },
+ {
+ "fieldname": "check_supplier_invoice_uniqueness",
+ "fieldtype": "Check",
+ "label": "Check Supplier Invoice Number Uniqueness",
+ "permlevel": 0,
+ "precision": ""
}
],
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
- "modified": "2015-02-05 05:11:34.163902",
+ "modified": "2015-07-14 00:51:48.095525",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
index c39550b..cd9d9d0 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -2,6 +2,10 @@
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Bank Reconciliation", {
+ refresh: function(frm) {
+ frm.disable_save();
+ },
+
update_clearance_date: function(frm) {
return frappe.call({
method: "update_details",
@@ -33,5 +37,4 @@
cur_frm.set_value("from_date", frappe.datetime.month_start());
cur_frm.set_value("to_date", frappe.datetime.month_end());
-}
-
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index fa178fe..7dd021e 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -25,7 +25,8 @@
where
t2.parent = t1.name and t2.account = %s
and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1
- and ifnull(t1.is_opening, 'No') = 'No' %s""" %
+ and ifnull(t1.is_opening, 'No') = 'No' %s
+ order by t1.posting_date""" %
('%s', '%s', '%s', condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
self.set('journal_entries', [])
diff --git a/erpnext/accounts/doctype/c_form/c_form.py b/erpnext/accounts/doctype/c_form/c_form.py
index 9064754..c14990a 100644
--- a/erpnext/accounts/doctype/c_form/c_form.py
+++ b/erpnext/accounts/doctype/c_form/c_form.py
@@ -54,7 +54,7 @@
frappe.throw(_("Please enter atleast 1 invoice in the table"))
def set_total_invoiced_amount(self):
- total = sum([flt(d.base_grand_total) for d in self.get('invoices')])
+ total = sum([flt(d.grand_total) for d in self.get('invoices')])
frappe.db.set(self, 'total_invoiced_amount', total)
def get_invoice_details(self, invoice_no):
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 409f59c..6177d35 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -139,7 +139,7 @@
"icon": "icon-money",
"idx": 1,
"in_create": 0,
- "modified": "2015-04-23 02:54:26.934607",
+ "modified": "2015-07-13 05:28:25.504801",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Cost Center",
@@ -189,7 +189,7 @@
"apply_user_permissions": 1,
"permlevel": 0,
"read": 1,
- "role": "Material User"
+ "role": "Stock User"
}
],
"search_fields": "parent_cost_center, is_group"
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index 0057d6d..8f887c8 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -56,7 +56,7 @@
],
"icon": "icon-calendar",
"idx": 1,
- "modified": "2015-04-18 07:33:23.922518",
+ "modified": "2015-07-13 05:28:27.745408",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Fiscal Year",
@@ -78,11 +78,63 @@
{
"apply_user_permissions": 1,
"delete": 0,
- "email": 1,
+ "email": 0,
"permlevel": 0,
- "print": 1,
+ "print": 0,
"read": 1,
- "role": "All"
+ "role": "Sales User"
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Stock User",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "share": 0,
+ "write": 0
}
],
"sort_field": "name",
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 54c7dd6..14b3c58 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -48,7 +48,8 @@
"fieldtype": "Dynamic Link",
"label": "Party",
"options": "party_type",
- "permlevel": 0
+ "permlevel": 0,
+ "search_index": 1
},
{
"fieldname": "cost_center",
@@ -192,7 +193,7 @@
"icon": "icon-list",
"idx": 1,
"in_create": 1,
- "modified": "2015-04-27 20:32:48.246818",
+ "modified": "2015-07-09 15:51:04.986518",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GL Entry",
@@ -224,6 +225,19 @@
"role": "Accounts Manager",
"submit": 0,
"write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 1,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 1,
+ "role": "Auditor",
+ "share": 0,
+ "write": 0
}
],
"search_fields": "voucher_no,account,posting_date,against_voucher",
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index ae4dae0..3d306fb 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -4,14 +4,14 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import flt, fmt_money, getdate, formatdate
+from frappe.utils import flt, fmt_money, getdate, formatdate, cstr
from frappe import _
from frappe.model.document import Document
class GLEntry(Document):
-
def validate(self):
+ self.flags.ignore_submit_comment = True
self.check_mandatory()
self.pl_must_have_cost_center()
self.validate_posting_date()
@@ -118,7 +118,7 @@
bal = flt(frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry`
where against_voucher_type=%s and against_voucher=%s
- and account = %s and party_type=%s and party=%s""",
+ and account = %s and ifnull(party_type, '')=%s and ifnull(party, '')=%s""",
(against_voucher_type, against_voucher, account, party_type, party))[0][0] or 0.0)
if against_voucher_type == 'Purchase Invoice':
@@ -127,8 +127,9 @@
against_voucher_amount = flt(frappe.db.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
- and account = %s and party_type=%s and party=%s and ifnull(against_voucher, '') = ''""",
- (against_voucher, account, party_type, party))[0][0])
+ and account = %s and ifnull(party_type, '')=%s and ifnull(party, '')=%s
+ and ifnull(against_voucher, '') = ''""",
+ (against_voucher, account, cstr(party_type), cstr(party)))[0][0])
if not against_voucher_amount:
frappe.throw(_("Against Journal Entry {0} is already adjusted against some other voucher")
@@ -157,3 +158,22 @@
frappe.throw(_("Account {0} is frozen").format(account))
elif frozen_accounts_modifier not in frappe.get_roles():
frappe.throw(_("Not authorized to edit frozen Account {0}").format(account))
+
+def update_against_account(voucher_type, voucher_no):
+ entries = frappe.db.get_all("GL Entry",
+ filters={"voucher_type": voucher_type, "voucher_no": voucher_no},
+ fields=["name", "party", "against", "debit", "credit", "account"])
+
+ accounts_debited, accounts_credited = [], []
+ for d in entries:
+ if flt(d.debit > 0): accounts_debited.append(d.party or d.account)
+ if flt(d.credit) > 0: accounts_credited.append(d.party or d.account)
+
+ for d in entries:
+ if flt(d.debit > 0):
+ new_against = ", ".join(list(set(accounts_credited)))
+ if flt(d.credit > 0):
+ new_against = ", ".join(list(set(accounts_debited)))
+
+ if d.against != new_against:
+ frappe.db.set_value("GL Entry", d.name, "against", new_against)
diff --git a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
new file mode 100644
index 0000000..383409c
--- /dev/null
+++ b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe, unittest
+from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+
+class TestGLEntry(unittest.TestCase):
+ def test_round_off_entry(self):
+ frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
+ frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")
+
+ jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Account Bank Account - _TC", 100, "_Test Cost Center - _TC", submit=False)
+
+ jv.get("accounts")[0].debit = 100.01
+ jv.flags.ignore_validate = True
+ jv.submit()
+
+ round_off_entry = frappe.db.sql("""select name from `tabGL Entry`
+ where voucher_type='Journal Entry' and voucher_no = %s
+ and account='_Test Write Off - _TC' and cost_center='_Test Cost Center - _TC'
+ and ifnull(debit, 0) = 0 and ifnull(credit, 0) = '.01'""", jv.name)
+
+ self.assertTrue(round_off_entry)
\ 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 5ff9e5f..3ea92e1 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -4,7 +4,7 @@
frappe.provide("erpnext.accounts");
frappe.require("assets/erpnext/js/utils.js");
-erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({
+erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
onload: function() {
this.load_defaults();
this.setup_queries();
@@ -130,10 +130,31 @@
cur_frm.cscript.update_totals(me.frm.doc);
}
});
- }
+ },
+
+ accounts_add: function(doc, cdt, cdn) {
+ var row = frappe.get_doc(cdt, cdn);
+ $.each(doc.accounts, function(i, d) {
+ if(d.account && d.party && d.party_type) {
+ row.account = d.account;
+ row.party = d.party;
+ row.party_type = d.party_type;
+ }
+ });
+
+ // set difference
+ if(doc.difference) {
+ if(doc.difference > 0) {
+ row.credit = doc.difference;
+ } else {
+ row.debit = -doc.difference;
+ }
+ }
+ },
+
});
-cur_frm.script_manager.make(erpnext.accounts.JournalVoucher);
+cur_frm.script_manager.make(erpnext.accounts.JournalEntry);
cur_frm.cscript.refresh = function(doc) {
erpnext.toggle_naming_series();
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 6eb395d..249fcc4 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -53,7 +53,7 @@
"fieldname": "posting_date",
"fieldtype": "Date",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Posting Date",
"no_copy": 1,
"oldfieldname": "posting_date",
@@ -445,7 +445,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-04-27 20:32:31.655580",
+ "modified": "2015-06-29 15:28:12.529019",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Entry",
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 6317793..23d4c73 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cstr, flt, fmt_money, formatdate, getdate, cint
+from frappe.utils import cstr, flt, fmt_money, formatdate, getdate, date_diff
from frappe import msgprint, _, scrub
from erpnext.setup.utils import get_company_currency
from erpnext.controllers.accounts_controller import AccountsController
@@ -35,7 +35,7 @@
self.set_print_format_fields()
self.validate_against_sales_order()
self.validate_against_purchase_order()
- self.check_credit_days()
+ self.check_due_date()
self.validate_expense_claim()
self.validate_credit_debit_note()
self.validate_empty_accounts_table()
@@ -76,34 +76,33 @@
account_type = frappe.db.get_value("Account", d.account, "account_type")
if account_type in ["Receivable", "Payable"]:
if not (d.party_type and d.party):
- frappe.throw(_("Row{0}: Party Type and Party is required for Receivable / Payable account {1}").format(d.idx, d.account))
+ frappe.throw(_("Row {0}: Party Type and Party is required for Receivable / Payable account {1}").format(d.idx, d.account))
elif d.party_type and d.party:
- frappe.throw(_("Row{0}: Party Type and Party is only applicable against Receivable / Payable account").format(d.idx))
+ frappe.throw(_("Row {0}: Party Type and Party is only applicable against Receivable / Payable account").format(d.idx))
def check_credit_limit(self):
- customers = list(set([d.party for d in self.get("accounts") if d.party_type=="Customer" and flt(d.debit) > 0]))
+ customers = list(set([d.party for d in self.get("accounts")
+ if d.party_type=="Customer" and d.party and flt(d.debit) > 0]))
if customers:
from erpnext.selling.doctype.customer.customer import check_credit_limit
for customer in customers:
check_credit_limit(customer, self.company)
- def check_credit_days(self):
- from erpnext.accounts.party import get_credit_days
- posting_date = None
+ def check_due_date(self):
if self.cheque_date:
for d in self.get("accounts"):
if d.party_type and d.party and d.get("credit" if d.party_type=="Customer" else "debit") > 0:
+ due_date = None
if d.against_invoice:
- posting_date = frappe.db.get_value("Sales Invoice", d.against_invoice, "posting_date")
+ due_date = frappe.db.get_value("Sales Invoice", d.against_invoice, "due_date")
elif d.against_voucher:
- posting_date = frappe.db.get_value("Purchase Invoice", d.against_voucher, "posting_date")
+ due_date = frappe.db.get_value("Purchase Invoice", d.against_voucher, "due_date")
- credit_days = get_credit_days(d.party_type, d.party, self.company)
- if posting_date and credit_days:
- date_diff = (getdate(self.cheque_date) - getdate(posting_date)).days
- if date_diff > flt(credit_days):
- msgprint(_("Note: Reference Date exceeds allowed credit days by {0} days for {1} {2}")
- .format(date_diff - flt(credit_days), d.party_type, d.party))
+ if due_date and getdate(self.cheque_date) > getdate(due_date):
+ diff = date_diff(self.cheque_date, due_date)
+ if diff > 0:
+ msgprint(_("Note: Reference Date exceeds invoice due date by {0} days for {1} {2}")
+ .format(diff, d.party_type, d.party))
def validate_cheque_info(self):
if self.voucher_type in ['Bank Entry']:
@@ -242,8 +241,8 @@
def set_against_account(self):
accounts_debited, accounts_credited = [], []
for d in self.get("accounts"):
- if flt(d.debit > 0): accounts_debited.append(d.account)
- if flt(d.credit) > 0: accounts_credited.append(d.account)
+ if flt(d.debit > 0): accounts_debited.append(d.party or d.account)
+ if flt(d.credit) > 0: accounts_credited.append(d.party or d.account)
for d in self.get("accounts"):
if flt(d.debit > 0): d.against_account = ", ".join(list(set(accounts_credited)))
@@ -274,29 +273,27 @@
else:
msgprint(_("Please enter Reference date"), raise_exception=frappe.MandatoryError)
+ company_currency = get_company_currency(self.company)
+
for d in self.get('accounts'):
if d.against_invoice and d.credit:
- currency = frappe.db.get_value("Sales Invoice", d.against_invoice, "currency")
-
- r.append(_("{0} against Sales Invoice {1}").format(fmt_money(flt(d.credit), currency = currency), \
+ r.append(_("{0} against Sales Invoice {1}").format(fmt_money(flt(d.credit), currency = company_currency), \
d.against_invoice))
if d.against_sales_order and d.credit:
- currency = frappe.db.get_value("Sales Order", d.against_sales_order, "currency")
- r.append(_("{0} against Sales Order {1}").format(fmt_money(flt(d.credit), currency = currency), \
+ r.append(_("{0} against Sales Order {1}").format(fmt_money(flt(d.credit), currency = company_currency), \
d.against_sales_order))
if d.against_voucher and d.debit:
- bill_no = frappe.db.sql("""select bill_no, bill_date, currency
+ bill_no = frappe.db.sql("""select bill_no, bill_date
from `tabPurchase Invoice` where name=%s""", d.against_voucher)
if bill_no and bill_no[0][0] and bill_no[0][0].lower().strip() \
not in ['na', 'not applicable', 'none']:
- r.append(_('{0} against Bill {1} dated {2}').format(fmt_money(flt(d.debit), currency=bill_no[0][2]), bill_no[0][0],
+ r.append(_('{0} against Bill {1} dated {2}').format(fmt_money(flt(d.debit), currency=company_currency), bill_no[0][0],
bill_no[0][1] and formatdate(bill_no[0][1].strftime('%Y-%m-%d'))))
if d.against_purchase_order and d.debit:
- currency = frappe.db.get_value("Purchase Order", d.against_purchase_order, "currency")
- r.append(_("{0} against Purchase Order {1}").format(fmt_money(flt(d.credit), currency = currency), \
+ r.append(_("{0} against Purchase Order {1}").format(fmt_money(flt(d.credit), currency = company_currency), \
d.against_purchase_order))
if self.user_remark:
@@ -427,18 +424,17 @@
def validate_expense_claim(self):
for d in self.accounts:
if d.against_expense_claim:
- sanctioned_amount, reimbursed_amount = frappe.db.get_value("Expense Claim", d.against_expense_claim,
- ("total_sanctioned_amount", "total_amount_reimbursed"))
- pending_amount = cint(sanctioned_amount) - cint(reimbursed_amount)
+ sanctioned_amount, reimbursed_amount = frappe.db.get_value("Expense Claim",
+ d.against_expense_claim, ("total_sanctioned_amount", "total_amount_reimbursed"))
+ pending_amount = flt(sanctioned_amount) - flt(reimbursed_amount)
if d.debit > pending_amount:
- frappe.throw(_("Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. \
- Pending Amount is {2}".format(d.idx, d.against_expense_claim, pending_amount)))
+ frappe.throw(_("Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2}".format(d.idx, d.against_expense_claim, pending_amount)))
def validate_credit_debit_note(self):
if self.stock_entry:
if frappe.db.get_value("Stock Entry", self.stock_entry, "docstatus") != 1:
frappe.throw(_("Stock Entry {0} is not submitted").format(self.stock_entry))
-
+
if frappe.db.exists({"doctype": "Journal Entry", "stock_entry": self.stock_entry, "docstatus":1}):
frappe.msgprint(_("Warning: Another {0} # {1} exists against stock entry {2}".format(self.voucher_type, self.name, self.stock_entry)))
@@ -458,11 +454,11 @@
if voucher_type=="Bank Entry":
account = frappe.db.get_value("Company", company, "default_bank_account")
if not account:
- account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank"})
+ account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank", "is_group": 0})
elif voucher_type=="Cash Entry":
account = frappe.db.get_value("Company", company, "default_cash_account")
if not account:
- account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash"})
+ account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash", "is_group": 0})
if account:
return {
@@ -538,15 +534,13 @@
def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
- if not filters.get("party"):
- return []
return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
- where jv_detail.parent = jv.name and jv_detail.account = %s and jv_detail.party = %s
+ where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s
and (ifnull(jv_detail.against_invoice, '') = '' and ifnull(jv_detail.against_voucher, '') = ''
and ifnull(jv_detail.against_jv, '') = '' )
and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield),
- (filters["account"], filters["party"], "%{0}%".format(txt), start, page_len))
+ (filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))
@frappe.whitelist()
def get_outstanding(args):
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 71df6cf..1355ea4 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -44,6 +44,10 @@
}
});
},
+
+ refresh: function() {
+ this.frm.disable_save();
+ },
party: function() {
var me = this
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.js b/erpnext/accounts/doctype/payment_tool/payment_tool.js
index cff0bd2..6eefdb9 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.js
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.js
@@ -32,6 +32,7 @@
});
frappe.ui.form.on("Payment Tool", "refresh", function(frm) {
+ frm.disable_save();
frappe.ui.form.trigger("Payment Tool", "party_type");
});
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.json b/erpnext/accounts/doctype/payment_tool/payment_tool.json
index 909f9c4..15cdb98 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.json
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.json
@@ -312,7 +312,7 @@
"is_submittable": 0,
"issingle": 1,
"istable": 0,
- "modified": "2015-02-21 03:59:08.154966",
+ "modified": "2015-06-05 11:17:33.843334",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Tool",
diff --git a/erpnext/accounts/doctype/pos_profile/__init__.py b/erpnext/accounts/doctype/pos_profile/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile/__init__.py
diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
similarity index 93%
rename from erpnext/accounts/doctype/pos_setting/pos_setting.js
rename to erpnext/accounts/doctype/pos_profile/pos_profile.js
index db5fec1..83643fe 100755
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -1,13 +1,13 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on("POS Setting", "onload", function(frm) {
+frappe.ui.form.on("POS Profile", "onload", function(frm) {
frm.set_query("selling_price_list", function() {
return { filter: { selling: 1 } };
});
frm.call({
- method: "erpnext.accounts.doctype.pos_setting.pos_setting.get_series",
+ method: "erpnext.accounts.doctype.pos_profile.pos_profile.get_series",
callback: function(r) {
if(!r.exc) {
set_field_options("naming_series", r.message);
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
new file mode 100644
index 0000000..0c5a4bb
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -0,0 +1,271 @@
+{
+ "allow_rename": 0,
+ "autoname": "hash",
+ "creation": "2013-05-24 12:15:51",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "fields": [
+ {
+ "fieldname": "user",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "User",
+ "oldfieldname": "user",
+ "oldfieldtype": "Link",
+ "options": "User",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "description": "",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Territory",
+ "oldfieldname": "territory",
+ "oldfieldtype": "Link",
+ "options": "Territory",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "[Select]",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "selling_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "Price List",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms and Conditions",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "in_filter": 0,
+ "label": "Print Heading",
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Select",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "default": "1",
+ "description": "Create Stock Ledger Entries when you submit a Sales Invoice",
+ "fieldname": "update_stock",
+ "fieldtype": "Check",
+ "label": "Update Stock",
+ "permlevel": 0,
+ "reqd": 0
+ },
+ {
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "Customer",
+ "oldfieldname": "customer_account",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "fieldname": "mode_of_payment",
+ "fieldtype": "Link",
+ "label": "Mode of Payment",
+ "options": "Mode of Payment",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "cash_bank_account",
+ "fieldtype": "Link",
+ "label": "Cash/Bank Account",
+ "oldfieldname": "cash_bank_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "income_account",
+ "fieldtype": "Link",
+ "label": "Income Account",
+ "oldfieldname": "income_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Expense Account",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "oldfieldtype": "Link",
+ "options": "Cost Center",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "label": "Write Off Account",
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "reqd": 1
+ },
+ {
+ "fieldname": "write_off_cost_center",
+ "fieldtype": "Link",
+ "label": "Write Off Cost Center",
+ "options": "Cost Center",
+ "permlevel": 0,
+ "precision": "",
+ "reqd": 1
+ },
+ {
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "oldfieldname": "charge",
+ "oldfieldtype": "Link",
+ "options": "Sales Taxes and Charges Template",
+ "permlevel": 0,
+ "read_only": 0
+ }
+ ],
+ "icon": "icon-cog",
+ "idx": 1,
+ "modified": "2015-07-07 08:56:04.381471",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "POS Profile",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts Manager",
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "apply_user_permissions": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts User",
+ "submit": 0
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "user"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
old mode 100755
new mode 100644
similarity index 87%
rename from erpnext/accounts/doctype/pos_setting/pos_setting.py
rename to erpnext/accounts/doctype/pos_profile/pos_profile.py
index 0a80061..eeb2bcf
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -8,22 +8,22 @@
from frappe.model.document import Document
-class POSSetting(Document):
+class POSProfile(Document):
def validate(self):
self.check_for_duplicate()
self.validate_expense_account()
self.validate_all_link_fields()
def check_for_duplicate(self):
- res = frappe.db.sql("""select name, user from `tabPOS Setting`
+ res = frappe.db.sql("""select name, user from `tabPOS Profile`
where ifnull(user, '') = %s and name != %s and company = %s""",
(self.user, self.name, self.company))
if res:
if res[0][1]:
- msgprint(_("POS Setting {0} already created for user: {1} and company {2}").format(res[0][0],
+ msgprint(_("POS Profile {0} already created for user: {1} and company {2}").format(res[0][0],
res[0][1], self.company), raise_exception=1)
else:
- msgprint(_("Global POS Setting {0} already created for company {1}").format(res[0][0],
+ msgprint(_("Global POS Profile {0} already created for company {1}").format(res[0][0],
self.company), raise_exception=1)
def validate_expense_account(self):
@@ -57,7 +57,7 @@
condition = ""
pos_view_users = frappe.db.sql_list("""select user
- from `tabPOS Setting` {0}""".format(condition))
+ from `tabPOS Profile` {0}""".format(condition))
for user in pos_view_users:
if user:
diff --git a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
new file mode 100644
index 0000000..62274a3
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('POS Profile')
+
+class TestPOSProfile(unittest.TestCase):
+ pass
diff --git a/erpnext/accounts/doctype/pos_setting/README.md b/erpnext/accounts/doctype/pos_setting/README.md
deleted file mode 100644
index 2ddef78..0000000
--- a/erpnext/accounts/doctype/pos_setting/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Standard settings for Point of Sales (POS) type of Sales Invoice.
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_setting/__init__.py b/erpnext/accounts/doctype/pos_setting/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/accounts/doctype/pos_setting/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.json b/erpnext/accounts/doctype/pos_setting/pos_setting.json
deleted file mode 100755
index b18a411..0000000
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.json
+++ /dev/null
@@ -1,263 +0,0 @@
-{
- "allow_rename": 0,
- "autoname": "hash",
- "creation": "2013-05-24 12:15:51",
- "docstatus": 0,
- "doctype": "DocType",
- "fields": [
- {
- "fieldname": "user",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "User",
- "oldfieldname": "user",
- "oldfieldtype": "Link",
- "options": "User",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "description": "",
- "fieldname": "territory",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Territory",
- "oldfieldname": "territory",
- "oldfieldtype": "Link",
- "options": "Territory",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "[Select]",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "currency",
- "fieldtype": "Link",
- "in_list_view": 0,
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "selling_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "Price List",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 0
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "default": "1",
- "description": "Create Stock Ledger Entries when you submit a Sales Invoice",
- "fieldname": "update_stock",
- "fieldtype": "Check",
- "label": "Update Stock",
- "permlevel": 0,
- "reqd": 0
- },
- {
- "fieldname": "customer",
- "fieldtype": "Link",
- "in_list_view": 0,
- "label": "Customer",
- "oldfieldname": "customer_account",
- "oldfieldtype": "Link",
- "options": "Customer",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 0
- },
- {
- "fieldname": "cash_bank_account",
- "fieldtype": "Link",
- "label": "Cash/Bank Account",
- "oldfieldname": "cash_bank_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "income_account",
- "fieldtype": "Link",
- "label": "Income Account",
- "oldfieldname": "income_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
- "fieldname": "expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Expense Account",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 0
- },
- {
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "label": "Warehouse",
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 0
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "oldfieldname": "cost_center",
- "oldfieldtype": "Link",
- "options": "Cost Center",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "oldfieldname": "charge",
- "oldfieldtype": "Link",
- "options": "Sales Taxes and Charges Template",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "label": "Write Off Account",
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "reqd": 1
- },
- {
- "fieldname": "write_off_cost_center",
- "fieldtype": "Link",
- "label": "Write Off Cost Center",
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "reqd": 1
- },
- {
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms and Conditions",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "in_filter": 0,
- "label": "Print Heading",
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Select",
- "options": "Print Heading",
- "permlevel": 0,
- "read_only": 0
- }
- ],
- "icon": "icon-cog",
- "idx": 1,
- "modified": "2015-02-05 05:11:42.344181",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "POS Setting",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts Manager",
- "share": 1,
- "submit": 0,
- "write": 1
- },
- {
- "apply_user_permissions": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts User",
- "submit": 0
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "user"
-}
diff --git a/erpnext/accounts/doctype/pos_setting/test_pos_setting.py b/erpnext/accounts/doctype/pos_setting/test_pos_setting.py
deleted file mode 100644
index 4f521f0..0000000
--- a/erpnext/accounts/doctype/pos_setting/test_pos_setting.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-test_records = frappe.get_test_records('POS Setting')
-
-class TestPOSSetting(unittest.TestCase):
- pass
diff --git a/erpnext/accounts/doctype/pos_setting/test_records.json b/erpnext/accounts/doctype/pos_setting/test_records.json
deleted file mode 100644
index fe51488..0000000
--- a/erpnext/accounts/doctype/pos_setting/test_records.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 43fd366..537c087 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -217,7 +217,7 @@
"depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"",
"fieldname": "discount_percentage",
"fieldtype": "Float",
- "label": "Discount Percentage",
+ "label": "Discount on Price List Rate (%)",
"permlevel": 0
},
{
@@ -245,7 +245,7 @@
"icon": "icon-gift",
"idx": 1,
"istable": 0,
- "modified": "2015-02-26 04:26:13.240166",
+ "modified": "2015-05-27 02:47:16.777466",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Pricing Rule",
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 0ed4433..70d6fb9 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -205,9 +205,9 @@
def filter_pricing_rules(args, pricing_rules):
# filter for qty
- if pricing_rules and args.get("qty"):
- pricing_rules = filter(lambda x: (args.qty>=flt(x.min_qty)
- and (args.qty<=x.max_qty if x.max_qty else True)), pricing_rules)
+ if pricing_rules:
+ pricing_rules = filter(lambda x: (flt(args.get("qty"))>=flt(x.min_qty)
+ and (flt(args.get("qty"))<=x.max_qty if x.max_qty else True)), pricing_rules)
# find pricing rule with highest priority
if pricing_rules:
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 3e16a31..07dbf72 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -68,7 +68,7 @@
}
},
-
+
supplier: function() {
var me = this;
if(this.frm.updating_party_details)
@@ -224,3 +224,4 @@
else
cur_frm.pformat.print_heading = __("Purchase Invoice");
}
+
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 947e1a1..69b0708 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -29,7 +29,8 @@
"options": "Supplier",
"permlevel": 0,
"print_hide": 1,
- "read_only": 0
+ "read_only": 0,
+ "search_index": 1
},
{
"depends_on": "supplier",
@@ -37,7 +38,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 0,
- "label": "Name",
+ "label": "Supplier Name",
"oldfieldname": "supplier_name",
"oldfieldtype": "Data",
"permlevel": 0,
@@ -112,7 +113,7 @@
"print_hide": 1,
"read_only": 0,
"reqd": 0,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "bill_date",
@@ -125,7 +126,7 @@
"print_hide": 1,
"read_only": 0,
"reqd": 0,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "amended_from",
@@ -151,7 +152,7 @@
"permlevel": 0,
"print_hide": 1,
"read_only": 0,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "currency_and_price_list",
@@ -428,7 +429,7 @@
"default": "Grand Total",
"fieldname": "apply_discount_on",
"fieldtype": "Select",
- "label": "Apply Discount On",
+ "label": "Apply Additional Discount On",
"options": "\nGrand Total\nNet Total",
"permlevel": 0,
"precision": "",
@@ -443,7 +444,7 @@
{
"fieldname": "discount_amount",
"fieldtype": "Currency",
- "label": "Discount Amount",
+ "label": "Additional Discount Amount",
"options": "currency",
"permlevel": 0,
"precision": "",
@@ -452,7 +453,7 @@
{
"fieldname": "base_discount_amount",
"fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
+ "label": "Additional Discount Amount (Company Currency)",
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
@@ -556,7 +557,7 @@
"permlevel": 0,
"print_hide": 1,
"read_only": 1,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "write_off_amount",
@@ -611,7 +612,7 @@
{
"fieldname": "advances_section",
"fieldtype": "Section Break",
- "label": "Advances",
+ "label": "",
"oldfieldtype": "Section Break",
"options": "icon-money",
"permlevel": 0,
@@ -665,7 +666,7 @@
"depends_on": "supplier",
"fieldname": "contact_section",
"fieldtype": "Section Break",
- "label": "Contact Info",
+ "label": "",
"options": "icon-bullhorn",
"permlevel": 0,
"read_only": 0
@@ -733,7 +734,7 @@
"permlevel": 0,
"print_hide": 1,
"read_only": 0,
- "search_index": 1
+ "search_index": 0
},
{
"allow_on_submit": 1,
@@ -760,7 +761,7 @@
"permlevel": 0,
"print_hide": 1,
"read_only": 0,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "mode_of_payment",
@@ -779,15 +780,6 @@
"read_only": 0
},
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "options": "Letter Head",
- "permlevel": 0,
- "print_hide": 1
- },
- {
"fieldname": "fiscal_year",
"fieldtype": "Link",
"in_filter": 1,
@@ -798,7 +790,7 @@
"permlevel": 0,
"print_hide": 1,
"read_only": 0,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "remarks",
@@ -934,12 +926,21 @@
"no_copy": 1,
"permlevel": 0,
"print_hide": 1
+ },
+ {
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_print_format",
+ "fieldtype": "Link",
+ "label": "Recurring Print Format",
+ "options": "Print Format",
+ "permlevel": 0,
+ "precision": ""
}
],
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-05-15 14:20:47.718194",
+ "modified": "2015-07-03 03:26:32.934540",
"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 c0ebf68..1ac0f5a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint, formatdate, flt
+from frappe.utils import cint, formatdate, flt, getdate
from frappe import msgprint, _, throw
from erpnext.setup.utils import get_company_currency
import frappe.defaults
@@ -39,6 +39,7 @@
self.po_required()
self.pr_required()
+ self.validate_supplier_invoice()
self.check_active_purchase_items()
self.check_conversion_rate()
self.validate_credit_to_acc()
@@ -87,9 +88,7 @@
throw(_("Conversion rate cannot be 0 or 1"))
def validate_credit_to_acc(self):
- root_type, account_type = frappe.db.get_value("Account", self.credit_to, ["root_type", "account_type"])
- if root_type != "Liability":
- frappe.throw(_("Credit To account must be a liability account"))
+ account_type = frappe.db.get_value("Account", self.credit_to, "account_type")
if account_type != "Payable":
frappe.throw(_("Credit To account must be a Payable account"))
@@ -125,20 +124,11 @@
}
})
- if cint(frappe.defaults.get_global_default('maintain_same_rate')):
- super(PurchaseInvoice, self).validate_with_previous_doc({
- "Purchase Order Item": {
- "ref_dn_field": "po_detail",
- "compare_fields": [["rate", "="]],
- "is_child_table": True,
- "allow_duplicate_prev_row_id": True
- },
- "Purchase Receipt Item": {
- "ref_dn_field": "pr_detail",
- "compare_fields": [["rate", "="]],
- "is_child_table": True
- }
- })
+ if cint(frappe.db.get_single_value('Buying Settings', 'maintain_same_rate')):
+ self.validate_rate_with_reference_doc([
+ ["Purchase Order", "purchase_order", "po_detail"],
+ ["Purchase Receipt", "purchase_receipt", "pr_detail"]
+ ])
def set_against_expense_account(self):
auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
@@ -165,7 +155,7 @@
elif item.expense_account not in against_accounts:
# if no auto_accounting_for_stock or not a stock item
against_accounts.append(item.expense_account)
-
+
self.against_expense_account = ",".join(against_accounts)
def po_required(self):
@@ -272,7 +262,7 @@
gl_entries.append(
self.get_gl_dict({
"account": tax.account_head,
- "against": self.credit_to,
+ "against": self.supplier,
"debit": tax.add_deduct_tax == "Add" and tax.base_tax_amount_after_discount_amount or 0,
"credit": tax.add_deduct_tax == "Deduct" and tax.base_tax_amount_after_discount_amount or 0,
"remarks": self.remarks,
@@ -296,7 +286,7 @@
gl_entries.append(
self.get_gl_dict({
"account": item.expense_account,
- "against": self.credit_to,
+ "against": self.supplier,
"debit": item.base_net_amount,
"remarks": self.remarks,
"cost_center": item.cost_center
@@ -316,7 +306,7 @@
gl_entries.append(
self.get_gl_dict({
"account": stock_received_but_not_billed,
- "against": self.credit_to,
+ "against": self.supplier,
"debit": flt(item.item_tax_amount, self.precision("item_tax_amount", item)),
"remarks": self.remarks or "Accounting Entry for Stock"
})
@@ -342,7 +332,7 @@
self.get_gl_dict({
"account": expenses_included_in_valuation,
"cost_center": cost_center,
- "against": self.credit_to,
+ "against": self.supplier,
"credit": applicable_amount,
"remarks": self.remarks or "Accounting Entry for Stock"
})
@@ -356,7 +346,7 @@
gl_entries.append(
self.get_gl_dict({
"account": self.write_off_account,
- "against": self.credit_to,
+ "against": self.supplier,
"credit": flt(self.write_off_amount),
"remarks": self.remarks,
"cost_center": self.write_off_cost_center
@@ -375,7 +365,7 @@
self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
self.make_gl_entries_on_cancel()
self.update_project()
-
+
def update_project(self):
project_list = []
for d in self.items:
@@ -386,6 +376,17 @@
project.save()
project_list.append(d.project_name)
+ def validate_supplier_invoice(self):
+ if self.bill_date:
+ if getdate(self.bill_date) > getdate(self.posting_date):
+ frappe.throw("Supplier Invoice Date cannot be greater than Posting Date")
+ if self.bill_no:
+ if cint(frappe.db.get_single_value("Accounts Settings", "check_supplier_invoice_uniqueness")):
+ pi = frappe.db.exists("Purchase Invoice", {"bill_no": self.bill_no,
+ "fiscal_year": self.fiscal_year, "name": ("!=", self.name)})
+ if pi:
+ frappe.throw("Supplier Invoice No exists in Purchase Invoice {0}".format(pi))
+
@frappe.whitelist()
def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond
@@ -401,4 +402,4 @@
and tabAccount.company = '%(company)s'
and tabAccount.%(key)s LIKE '%(txt)s'
%(mcond)s""" % {'company': filters['company'], 'key': searchfield,
- 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype)})
+ 'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype)})
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 54b633b..ce6ac7a 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -40,7 +40,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -50,6 +50,23 @@
"width": "300px"
},
{
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "hidden": 1,
+ "label": "Image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1
+ },
+ {
"fieldname": "quantity_and_rate",
"fieldtype": "Section Break",
"label": "Quantity and Rate",
@@ -105,10 +122,11 @@
"read_only": 0
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount %",
+ "label": "Discount on Price List Rate (%)",
"permlevel": 0,
"print_hide": 0,
"read_only": 0
@@ -451,7 +469,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-02-23 15:35:32.895515",
+ "modified": "2015-07-02 03:00:44.496683",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 6047378..2c5bb12 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -7,6 +7,7 @@
@frappe.whitelist()
def get_items(price_list, sales_or_purchase, item=None):
condition = ""
+ order_by = ""
args = {"price_list": price_list}
if sales_or_purchase == "Sales":
@@ -30,16 +31,25 @@
item_code[0]["barcode"] = item
return item_code
- condition += " and (CONCAT(i.name, i.item_name) like %(name)s or (i.variant_of like %(name)s))"
- args["name"] = "%%%s%%" % item
+ condition += " and ((CONCAT(i.name, i.item_name) like %(name)s) or (i.variant_of like %(name)s) or (i.item_group like %(name)s))"
+ order_by = """if(locate(%(_name)s, i.name), locate(%(_name)s, i.name), 99999),
+ if(locate(%(_name)s, i.item_name), locate(%(_name)s, i.item_name), 99999),
+ if(locate(%(_name)s, i.variant_of), locate(%(_name)s, i.variant_of), 99999),
+ if(locate(%(_name)s, i.item_group), locate(%(_name)s, i.item_group), 99999),"""
+ args["name"] = "%%%s%%" % frappe.db.escape(item)
+ args["_name"] = item.replace("%", "")
+ # locate function is used to sort by closest match from the beginning of the value
return frappe.db.sql("""select i.name, i.item_name, i.image,
item_det.price_list_rate, item_det.currency
from `tabItem` i LEFT JOIN
(select item_code, price_list_rate, currency from
- `tabItem Price` where price_list=%s) item_det
+ `tabItem Price` where price_list=%(price_list)s) item_det
ON
(item_det.item_code=i.name or item_det.item_code=i.variant_of)
where
ifnull(i.has_variants, 0) = 0 and
- %s""" % ('%(price_list)s', condition), args, as_dict=1)
+ {condition}
+ order by
+ {order_by}
+ i.name""".format(condition=condition, order_by=order_by), args, as_dict=1)
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index d166638..5b2f348 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -23,7 +23,7 @@
this.frm.set_value("is_pos", 1);
this.is_pos(function() {
if (cint(frappe.defaults.get_user_defaults("fs_pos_view"))===1)
- erpnext.pos.toggle(me.frm);
+ erpnext.pos.toggle(me.frm, true);
});
}
}
@@ -65,7 +65,7 @@
});
if(!from_delivery_note) {
- cur_frm.page.add_menu_item(__('Make Delivery'), cur_frm.cscript['Make Delivery Note'], "icon-truck")
+ cur_frm.add_custom_button(__('Make Delivery'), cur_frm.cscript['Make Delivery Note'], "icon-truck")
}
}
@@ -75,14 +75,14 @@
}
// Show buttons only when pos view is active
- if (doc.docstatus===0 && !this.pos_active) {
+ if (cint(doc.docstatus==0) && cur_frm.page.current_view_name!=="pos") {
cur_frm.cscript.sales_order_btn();
cur_frm.cscript.delivery_note_btn();
}
},
sales_order_btn: function() {
- this.$sales_order_btn = cur_frm.page.add_menu_item(__('From Sales Order'),
+ this.$sales_order_btn = cur_frm.add_custom_button(__('From Sales Order'),
function() {
frappe.model.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
@@ -99,7 +99,7 @@
},
delivery_note_btn: function() {
- this.$delivery_note_btn = cur_frm.page.add_menu_item(__('From Delivery Note'),
+ this.$delivery_note_btn = cur_frm.add_custom_button(__('From Delivery Note'),
function() {
frappe.model.map_current_doc({
method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
@@ -253,7 +253,7 @@
if(r.message) {
cur_frm.set_value("cash_bank_account", r.message["account"]);
}
-
+
}
});
}
@@ -369,15 +369,15 @@
}
cur_frm.cscript.income_account = function(doc, cdt, cdn) {
- cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "income_account");
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "income_account");
}
cur_frm.cscript.expense_account = function(doc, cdt, cdn) {
- cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "expense_account");
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "expense_account");
}
cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
- cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "cost_center");
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "cost_center");
}
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
@@ -392,8 +392,6 @@
}
}
-
-
cur_frm.set_query("debit_to", function(doc) {
return{
filters: [
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 258edeb..25dd398 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1,1306 +1,1316 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-24 19:29:05",
- "default_print_format": "Standard",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-24 19:29:05",
+ "default_print_format": "Standard",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "customer_section",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-user",
+ "fieldname": "customer_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "SINV-",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "SINV-",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "customer",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Customer",
- "no_copy": 0,
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "customer",
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_list_view": 0,
- "label": "Name",
- "oldfieldname": "customer_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Address",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "mode_of_payment",
- "fieldtype": "Link",
- "label": "Mode of Payment",
- "no_copy": 0,
- "oldfieldname": "mode_of_payment",
- "oldfieldtype": "Select",
- "options": "Mode of Payment",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Link",
- "options": "Sales Invoice",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "no_copy": 1,
- "oldfieldname": "posting_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "reqd": 1,
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Customer",
+ "no_copy": 0,
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "due_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Payment Due Date",
- "no_copy": 1,
- "oldfieldname": "due_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1,
+ "depends_on": "customer",
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Customer Name",
+ "oldfieldname": "customer_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Address",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "mode_of_payment",
+ "fieldtype": "Link",
+ "label": "Mode of Payment",
+ "no_copy": 0,
+ "oldfieldname": "mode_of_payment",
+ "oldfieldtype": "Select",
+ "options": "Mode of Payment",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "is_pos",
- "fieldtype": "Check",
- "label": "Is POS",
- "oldfieldname": "is_pos",
- "oldfieldtype": "Check",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "shipping_address_name",
- "fieldtype": "Link",
- "hidden": 1,
- "in_filter": 1,
- "label": "Shipping Address Name",
- "options": "Address",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1
- },
- {
- "fieldname": "shipping_address",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Shipping Address",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Link",
+ "options": "Sales Invoice",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "description": "Rate at which Customer Currency is converted to customer's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Exchange Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
- "width": "50%"
- },
- {
- "fieldname": "selling_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "Price List",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1
- },
- {
- "description": "Rate at which Price list currency is converted to customer's base currency",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "no_copy": 0,
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
- "print_hide": 1
- },
- {
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "update_stock",
- "fieldtype": "Check",
- "label": "Update Stock",
- "oldfieldname": "update_stock",
- "oldfieldtype": "Check",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "oldfieldname": "entries",
- "oldfieldtype": "Table",
- "options": "Sales Invoice Item",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "fieldname": "packing_list",
- "fieldtype": "Section Break",
- "label": "Packing List",
- "options": "icon-suitcase",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "packed_items",
- "fieldtype": "Table",
- "label": "Packed Items",
- "options": "Packed Item",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "sales_bom_help",
- "fieldtype": "HTML",
- "label": "Sales BOM Help",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "section_break_30",
- "fieldtype": "Section Break",
- "permlevel": 0
- },
- {
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "column_break_32",
- "fieldtype": "Column Break",
- "permlevel": 0
- },
- {
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1
- },
- {
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "Taxes and Charges",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "oldfieldname": "charge",
- "oldfieldtype": "Link",
- "options": "Sales Taxes and Charges Template",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "column_break_38",
- "fieldtype": "Column Break",
- "permlevel": 0
- },
- {
- "fieldname": "shipping_rule",
- "fieldtype": "Link",
- "label": "Shipping Rule",
- "oldfieldtype": "Button",
- "options": "Shipping Rule",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "section_break_40",
- "fieldtype": "Section Break",
- "permlevel": 0
- },
- {
- "allow_on_submit": 1,
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Sales Taxes and Charges",
- "oldfieldname": "other_charges",
- "oldfieldtype": "Table",
- "options": "Sales Taxes and Charges",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "section_break_43",
- "fieldtype": "Section Break",
- "permlevel": 0
- },
- {
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_47",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "precision": ""
- },
- {
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "section_break_49",
- "fieldtype": "Section Break",
- "permlevel": 0,
- "precision": ""
- },
- {
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Discount On",
- "options": "\nGrand Total\nNet Total",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_51",
- "fieldtype": "Column Break",
- "permlevel": 0
- },
- {
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1
- },
- {
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "in_filter": 1,
- "label": "Grand Total (Company Currency)",
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
- "search_index": 0
- },
- {
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "description": "In Words will be visible once you save the Sales Invoice.",
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "width": "50%"
- },
- {
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "oldfieldname": "grand_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "oldfieldname": "rounded_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1
- },
- {
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "oldfieldname": "in_words_export",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1
- },
- {
- "fieldname": "total_advance",
- "fieldtype": "Currency",
- "label": "Total Advance",
- "oldfieldname": "total_advance",
- "oldfieldtype": "Currency",
- "options": "",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "outstanding_amount",
- "fieldtype": "Currency",
- "in_list_view": 0,
- "label": "Outstanding Amount",
- "no_copy": 1,
- "oldfieldname": "outstanding_amount",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "advances_section",
- "fieldtype": "Section Break",
- "label": "Advances",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "get_advances_received",
- "fieldtype": "Button",
- "label": "Get Advances Received",
- "oldfieldtype": "Button",
- "options": "get_advances",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "advances",
- "fieldtype": "Table",
- "label": "Advances",
- "oldfieldname": "advance_adjustment_details",
- "oldfieldtype": "Table",
- "options": "Sales Invoice Advance",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
- "fieldname": "payments_section",
- "fieldtype": "Section Break",
- "label": "Payments",
- "options": "icon-money",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "depends_on": "is_pos",
- "fieldname": "paid_amount",
- "fieldtype": "Currency",
- "label": "Paid Amount",
- "no_copy": 1,
- "oldfieldname": "paid_amount",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "is_pos",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
- "width": "50%"
- },
- {
- "depends_on": "is_pos",
- "fieldname": "cash_bank_account",
- "fieldtype": "Link",
- "label": "Cash/Bank Account",
- "oldfieldname": "cash_bank_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "grand_total",
- "fieldname": "column_break4",
- "fieldtype": "Section Break",
- "label": "Write Off",
- "permlevel": 0,
- "read_only": 0,
- "width": "50%"
- },
- {
- "depends_on": "",
- "fieldname": "write_off_amount",
- "fieldtype": "Currency",
- "label": "Write Off Amount",
- "no_copy": 1,
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "",
- "fieldname": "write_off_outstanding_amount_automatically",
- "fieldtype": "Check",
- "label": "Write Off Outstanding Amount",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
- "fieldname": "column_break_74",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "precision": ""
- },
- {
- "depends_on": "",
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "label": "Write Off Account",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "",
- "fieldname": "write_off_cost_center",
- "fieldtype": "Link",
- "label": "Write Off Cost Center",
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "fold",
- "fieldtype": "Fold",
- "permlevel": 0
- },
- {
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "oldfieldtype": "Section Break",
- "options": "icon-legal",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions Details",
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "depends_on": "customer",
- "fieldname": "contact_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "label": "Contact Info",
- "options": "icon-bullhorn",
- "permlevel": 0,
- "read_only": 0
- },
- {
- "description": "",
- "fieldname": "territory",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0
- },
- {
- "description": "",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "options": "Customer Group",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "search_index": 0
- },
- {
- "fieldname": "col_break23",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
- "width": "50%"
- },
- {
- "fieldname": "customer_address",
- "fieldtype": "Link",
- "label": "Customer Address",
- "options": "Address",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "label": "Contact Person",
- "options": "Contact",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "description": "Customer (Receivable) Account",
- "fieldname": "debit_to",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Debit To",
- "oldfieldname": "debit_to",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "default": "Today",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "no_copy": 1,
+ "oldfieldname": "posting_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "project_name",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Project Name",
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "permlevel": 0,
- "read_only": 0,
- "search_index": 1
- },
- {
- "depends_on": "eval:doc.source == 'Campaign'",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "label": "Campaign",
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "fieldname": "source",
- "fieldtype": "Select",
- "label": "Source",
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0
- },
- {
- "default": "No",
- "description": "Considered as an Opening Balance",
- "fieldname": "is_opening",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Is Opening Entry",
- "oldfieldname": "is_opening",
- "oldfieldtype": "Select",
- "options": "No\nYes",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "due_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Payment Due Date",
+ "no_copy": 1,
+ "oldfieldname": "due_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "c_form_applicable",
- "fieldtype": "Select",
- "label": "C-Form Applicable",
- "no_copy": 1,
- "options": "No\nYes",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "is_pos",
+ "fieldtype": "Check",
+ "label": "Is POS",
+ "oldfieldname": "is_pos",
+ "oldfieldtype": "Check",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "in_filter": 1,
+ "label": "Shipping Address Name",
+ "options": "Address",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "shipping_address",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Shipping Address",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "description": "Rate at which Customer Currency is converted to customer's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "fieldname": "selling_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "Price List",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "description": "Rate at which Price list currency is converted to customer's base currency",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "update_stock",
+ "fieldtype": "Check",
+ "label": "Update Stock",
+ "oldfieldname": "update_stock",
+ "oldfieldtype": "Check",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "entries",
+ "oldfieldtype": "Table",
+ "options": "Sales Invoice Item",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "fieldname": "packing_list",
+ "fieldtype": "Section Break",
+ "label": "Packing List",
+ "options": "icon-suitcase",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "packed_items",
+ "fieldtype": "Table",
+ "label": "Packed Items",
+ "options": "Packed Item",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "product_bundle_help",
+ "fieldtype": "HTML",
+ "label": "Product Bundle Help",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "section_break_30",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_32",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "Taxes and Charges",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "oldfieldname": "charge",
+ "oldfieldtype": "Link",
+ "options": "Sales Taxes and Charges Template",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "column_break_38",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "shipping_rule",
+ "fieldtype": "Link",
+ "label": "Shipping Rule",
+ "oldfieldtype": "Button",
+ "options": "Shipping Rule",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "section_break_40",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Sales Taxes and Charges",
+ "oldfieldname": "other_charges",
+ "oldfieldtype": "Table",
+ "options": "Sales Taxes and Charges",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "section_break_43",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_47",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_49",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_51",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "in_filter": 1,
+ "label": "Grand Total (Company Currency)",
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 0
+ },
+ {
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "description": "In Words will be visible once you save the Sales Invoice.",
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break5",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "oldfieldname": "grand_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "oldfieldname": "rounded_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "oldfieldname": "in_words_export",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_advance",
+ "fieldtype": "Currency",
+ "label": "Total Advance",
+ "oldfieldname": "total_advance",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "outstanding_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 0,
+ "label": "Outstanding Amount",
+ "no_copy": 1,
+ "oldfieldname": "outstanding_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "advances_section",
+ "fieldtype": "Section Break",
+ "label": "Advances",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "get_advances_received",
+ "fieldtype": "Button",
+ "label": "Get Advances Received",
+ "oldfieldtype": "Button",
+ "options": "get_advances",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "advances",
+ "fieldtype": "Table",
+ "label": "Advances",
+ "oldfieldname": "advance_adjustment_details",
+ "oldfieldtype": "Table",
+ "options": "Sales Invoice Advance",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
+ "fieldname": "payments_section",
+ "fieldtype": "Section Break",
+ "label": "Payments",
+ "options": "icon-money",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "depends_on": "is_pos",
+ "fieldname": "paid_amount",
+ "fieldtype": "Currency",
+ "label": "Paid Amount",
+ "no_copy": 1,
+ "oldfieldname": "paid_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "depends_on": "is_pos",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "depends_on": "is_pos",
+ "fieldname": "cash_bank_account",
+ "fieldtype": "Link",
+ "label": "Cash/Bank Account",
+ "oldfieldname": "cash_bank_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "depends_on": "grand_total",
+ "fieldname": "column_break4",
+ "fieldtype": "Section Break",
+ "label": "",
+ "permlevel": 0,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "depends_on": "",
+ "fieldname": "write_off_amount",
+ "fieldtype": "Currency",
+ "label": "Write Off Amount",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "depends_on": "",
+ "fieldname": "write_off_outstanding_amount_automatically",
+ "fieldtype": "Check",
+ "label": "Write Off Outstanding Amount",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
+ "fieldname": "column_break_74",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "",
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "label": "Write Off Account",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "depends_on": "",
+ "fieldname": "write_off_cost_center",
+ "fieldtype": "Link",
+ "label": "Write Off Cost Center",
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "fold",
+ "fieldtype": "Fold",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-legal",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions Details",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "depends_on": "customer",
+ "fieldname": "contact_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "label": "",
+ "options": "icon-bullhorn",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "description": "",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0
+ },
+ {
+ "description": "",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "options": "Customer Group",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "search_index": 0
+ },
+ {
+ "fieldname": "col_break23",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "fieldname": "customer_address",
+ "fieldtype": "Link",
+ "label": "Customer Address",
+ "options": "Address",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "label": "Contact Person",
+ "options": "Contact",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "description": "Customer (Receivable) Account",
+ "fieldname": "debit_to",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Debit To",
+ "oldfieldname": "debit_to",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
+ "permlevel": 0,
+ "read_only": 0,
+ "search_index": 0
+ },
+ {
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "label": "Campaign",
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "label": "Source",
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "default": "No",
+ "description": "Considered as an Opening Balance",
+ "fieldname": "is_opening",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Is Opening Entry",
+ "oldfieldname": "is_opening",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "search_index": 0
+ },
+ {
+ "fieldname": "c_form_applicable",
+ "fieldtype": "Select",
+ "label": "C-Form Applicable",
+ "no_copy": 1,
+ "options": "No\nYes",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 0
- },
+ },
{
- "fieldname": "c_form_no",
- "fieldtype": "Link",
- "label": "C-Form No",
- "no_copy": 1,
- "options": "C-Form",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "c_form_no",
+ "fieldtype": "Link",
+ "label": "C-Form No",
+ "no_copy": 1,
+ "options": "C-Form",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break8",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "column_break8",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 1
- },
+ },
{
- "fieldname": "posting_time",
- "fieldtype": "Time",
- "label": "Posting Time",
- "no_copy": 1,
- "oldfieldname": "posting_time",
- "oldfieldtype": "Time",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "posting_time",
+ "fieldtype": "Time",
+ "label": "Posting Time",
+ "no_copy": 1,
+ "oldfieldname": "posting_time",
+ "oldfieldtype": "Time",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "no_copy": 0,
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "no_copy": 0,
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "label": "Remarks",
+ "no_copy": 1,
+ "oldfieldname": "remarks",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "sales_team_section_break",
- "fieldtype": "Section Break",
- "label": "Sales Team",
- "oldfieldtype": "Section Break",
- "options": "icon-group",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "sales_team_section_break",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-group",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break9",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break9",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "sales_partner",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Sales Partner",
- "oldfieldname": "sales_partner",
- "oldfieldtype": "Link",
- "options": "Sales Partner",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "sales_partner",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Sales Partner",
+ "oldfieldname": "sales_partner",
+ "oldfieldtype": "Link",
+ "options": "Sales Partner",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break10",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break10",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "commission_rate",
- "fieldtype": "Float",
- "label": "Commission Rate (%)",
- "oldfieldname": "commission_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "commission_rate",
+ "fieldtype": "Float",
+ "label": "Commission Rate (%)",
+ "oldfieldname": "commission_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "total_commission",
- "fieldtype": "Currency",
- "label": "Total Commission",
- "oldfieldname": "total_commission",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_commission",
+ "fieldtype": "Currency",
+ "label": "Total Commission",
+ "oldfieldname": "total_commission",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break2",
- "fieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "section_break2",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "sales_team",
- "fieldtype": "Table",
- "label": "Sales Team1",
- "oldfieldname": "sales_team",
- "oldfieldtype": "Table",
- "options": "Sales Team",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "sales_team",
+ "fieldtype": "Table",
+ "label": "Sales Team1",
+ "oldfieldname": "sales_team",
+ "oldfieldtype": "Table",
+ "options": "Sales Team",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "depends_on": "eval:doc.docstatus<2",
- "fieldname": "recurring_invoice",
- "fieldtype": "Section Break",
- "label": "Recurring Invoice",
- "options": "icon-time",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.docstatus<2",
+ "fieldname": "recurring_invoice",
+ "fieldtype": "Section Break",
+ "label": "Recurring Invoice",
+ "options": "icon-time",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break11",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break11",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.docstatus<2",
- "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date",
- "fieldname": "is_recurring",
- "fieldtype": "Check",
- "label": "Is Recurring",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.docstatus<2",
+ "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date",
+ "fieldname": "is_recurring",
+ "fieldtype": "Check",
+ "label": "Is Recurring",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Select the period when the invoice will be generated automatically",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Select the period when the invoice will be generated automatically",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Start date of current invoice's period",
- "fieldname": "from_date",
- "fieldtype": "Date",
- "label": "From Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Start date of current invoice's period",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "End date of current invoice's period",
- "fieldname": "to_date",
- "fieldtype": "Date",
- "label": "To Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "End date of current invoice's period",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ",
- "fieldname": "repeat_on_day_of_month",
- "fieldtype": "Int",
- "label": "Repeat on Day of Month",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ",
+ "fieldname": "repeat_on_day_of_month",
+ "fieldtype": "Int",
+ "label": "Repeat on Day of Month",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which recurring invoice will be stop",
- "fieldname": "end_date",
- "fieldtype": "Date",
- "label": "End Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which recurring invoice will be stop",
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "label": "End Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break12",
- "fieldtype": "Column Break",
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break12",
+ "fieldtype": "Column Break",
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which next invoice will be generated. It is generated on submit.\n",
- "fieldname": "next_date",
- "fieldtype": "Date",
- "label": "Next Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which next invoice will be generated. It is generated on submit.\n",
+ "fieldname": "next_date",
+ "fieldtype": "Date",
+ "label": "Next Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.",
- "fieldname": "recurring_id",
- "fieldtype": "Data",
- "label": "Recurring Id",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.",
+ "fieldname": "recurring_id",
+ "fieldtype": "Data",
+ "label": "Recurring Id",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date",
- "fieldname": "notification_email_address",
- "fieldtype": "Small Text",
- "label": "Notification Email Address",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date",
+ "fieldname": "notification_email_address",
+ "fieldtype": "Small Text",
+ "label": "Notification Email Address",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "against_income_account",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Against Income Account",
- "no_copy": 1,
- "oldfieldname": "against_income_account",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_print_format",
+ "fieldtype": "Link",
+ "label": "Recurring Print Format",
+ "options": "Print Format",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "against_income_account",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Against Income Account",
+ "no_copy": 1,
+ "oldfieldname": "against_income_account",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 1
}
- ],
- "icon": "icon-file-text",
- "idx": 1,
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
"is_submittable": 1,
- "modified": "2015-04-27 20:31:51.966965",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Invoice",
- "owner": "Administrator",
+ "modified": "2015-07-09 17:33:28.583808",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Invoice",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "cancel": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Customer"
- },
+ },
{
- "permlevel": 1,
- "read": 1,
- "role": "Accounts Manager",
+ "permlevel": 1,
+ "read": 1,
+ "role": "Accounts Manager",
"write": 1
}
- ],
- "read_only_onload": 1,
- "search_fields": "posting_date, due_date, customer, fiscal_year, base_grand_total, outstanding_amount",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only_onload": 1,
+ "search_fields": "posting_date, due_date, customer, fiscal_year, base_grand_total, outstanding_amount",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 7c366c1..829478d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -65,8 +65,7 @@
self.set_against_income_account()
self.validate_c_form()
self.validate_time_logs_are_submitted()
- self.validate_multiple_billing("Delivery Note", "dn_detail", "amount",
- "items")
+ self.validate_multiple_billing("Delivery Note", "dn_detail", "amount", "items")
def on_submit(self):
super(SalesInvoice, self).on_submit()
@@ -139,7 +138,7 @@
if not self.debit_to:
self.debit_to = get_party_account(self.company, self.customer, "Customer")
- if not self.due_date:
+ if not self.due_date and self.customer:
self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company)
super(SalesInvoice, self).set_missing_values(for_validate)
@@ -160,16 +159,17 @@
frappe.throw(_("Time Log Batch {0} must be 'Submitted'").format(d.time_log_batch))
def set_pos_fields(self, for_validate=False):
- """Set retail related fields from pos settings"""
+ """Set retail related fields from POS Profiles"""
if cint(self.is_pos) != 1:
return
- from erpnext.stock.get_item_details import get_pos_settings_item_details, get_pos_settings
- pos = get_pos_settings(self.company)
+ from erpnext.stock.get_item_details import get_pos_profiles_item_details, get_pos_profiles
+ pos = get_pos_profiles(self.company)
if pos:
if not for_validate and not self.customer:
self.customer = pos.customer
+ self.mode_of_payment = pos.mode_of_payment
# self.set_customer_defaults()
for fieldname in ('territory', 'naming_series', 'currency', 'taxes_and_charges', 'letter_head', 'tc_name',
@@ -184,7 +184,7 @@
# set pos values in items
for item in self.get("items"):
if item.get('item_code'):
- for fname, val in get_pos_settings_item_details(pos,
+ for fname, val in get_pos_profiles_item_details(pos,
frappe._dict(item.as_dict()), pos).items():
if (not for_validate) or (for_validate and not item.get(fname)):
@@ -236,9 +236,7 @@
reconcile_against_document(lst)
def validate_debit_to_acc(self):
- root_type, account_type = frappe.db.get_value("Account", self.debit_to, ["root_type", "account_type"])
- if root_type != "Asset":
- frappe.throw(_("Debit To account must be a liability account"))
+ account_type = frappe.db.get_value("Account", self.debit_to, "account_type")
if account_type != "Receivable":
frappe.throw(_("Debit To account must be a Receivable account"))
@@ -266,20 +264,11 @@
},
})
- if cint(frappe.defaults.get_global_default('maintain_same_sales_rate')):
- super(SalesInvoice, self).validate_with_previous_doc({
- "Sales Order Item": {
- "ref_dn_field": "so_detail",
- "compare_fields": [["rate", "="]],
- "is_child_table": True,
- "allow_duplicate_prev_row_id": True
- },
- "Delivery Note Item": {
- "ref_dn_field": "dn_detail",
- "compare_fields": [["rate", "="]],
- "is_child_table": True
- }
- })
+ if cint(frappe.db.get_single_value('Selling Settings', 'maintain_same_sales_rate')):
+ self.validate_rate_with_reference_doc([
+ ["Sales Order", "sales_order", "so_detail"],
+ ["Delivery Note", "delivery_note", "dn_detail"]
+ ])
def set_against_income_account(self):
"""Set against account for debit to account"""
@@ -371,24 +360,24 @@
def get_warehouse(self):
- user_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
+ user_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
where ifnull(user,'') = %s and company = %s""", (frappe.session['user'], self.company))
- warehouse = user_pos_setting[0][1] if user_pos_setting else None
+ warehouse = user_pos_profile[0][1] if user_pos_profile else None
if not warehouse:
- global_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
+ global_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
where ifnull(user,'') = '' and company = %s""", self.company)
- if global_pos_setting:
- warehouse = global_pos_setting[0][1]
- elif not user_pos_setting:
- msgprint(_("POS Setting required to make POS Entry"), raise_exception=True)
+ if global_pos_profile:
+ warehouse = global_pos_profile[0][1]
+ elif not user_pos_profile:
+ msgprint(_("POS Profile required to make POS Entry"), raise_exception=True)
return warehouse
def on_update(self):
if cint(self.update_stock) == 1:
- # Set default warehouse from pos setting
+ # Set default warehouse from POS Profile
if cint(self.is_pos) == 1:
w = self.get_warehouse()
if w:
@@ -506,7 +495,7 @@
gl_entries.append(
self.get_gl_dict({
"account": tax.account_head,
- "against": self.debit_to,
+ "against": self.customer,
"credit": flt(tax.base_tax_amount_after_discount_amount),
"remarks": self.remarks,
"cost_center": tax.cost_center
@@ -520,7 +509,7 @@
gl_entries.append(
self.get_gl_dict({
"account": item.income_account,
- "against": self.debit_to,
+ "against": self.customer,
"credit": item.base_net_amount,
"remarks": self.remarks,
"cost_center": item.cost_center
@@ -551,7 +540,7 @@
gl_entries.append(
self.get_gl_dict({
"account": self.cash_bank_account,
- "against": self.debit_to,
+ "against": self.customer,
"debit": self.paid_amount,
"remarks": self.remarks,
})
@@ -575,7 +564,7 @@
gl_entries.append(
self.get_gl_dict({
"account": self.write_off_account,
- "against": self.debit_to,
+ "against": self.customer,
"debit": self.write_off_amount,
"remarks": self.remarks,
"cost_center": self.write_off_cost_center
@@ -590,7 +579,7 @@
@frappe.whitelist()
def get_bank_cash_account(mode_of_payment, company):
- account = frappe.db.get_value("Mode of Payment Account",
+ account = frappe.db.get_value("Mode of Payment Account",
{"parent": mode_of_payment, "company": company}, "default_account")
if not account:
frappe.msgprint(_("Please set default Cash or Bank account in Mode of Payment {0}").format(mode_of_payment))
@@ -614,7 +603,7 @@
and tabAccount.company = '%(company)s'
and tabAccount.%(key)s LIKE '%(txt)s'
%(mcond)s""" % {'company': filters['company'], 'key': searchfield,
- 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype)})
+ 'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype)})
@frappe.whitelist()
def make_delivery_note(source_name, target_doc=None):
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 9db2b36..cf752af 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -5,6 +5,7 @@
import frappe
import unittest, copy
import time
+from frappe.utils import nowdate, add_days
from erpnext.accounts.utils import get_stock_and_account_difference
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
from erpnext.projects.doctype.time_log_batch.test_time_log_batch import *
@@ -462,7 +463,7 @@
def test_pos_gl_entry_with_aii(self):
set_perpetual_inventory()
- self.make_pos_setting()
+ self.make_pos_profile()
self._insert_purchase_receipt()
@@ -517,19 +518,19 @@
set_perpetual_inventory(0)
- frappe.db.sql("delete from `tabPOS Setting`")
+ frappe.db.sql("delete from `tabPOS Profile`")
- def make_pos_setting(self):
- pos_setting = frappe.get_doc({
+ def make_pos_profile(self):
+ pos_profile = frappe.get_doc({
"cash_bank_account": "_Test Account Bank Account - _TC",
"company": "_Test Company",
"cost_center": "_Test Cost Center - _TC",
"currency": "INR",
- "doctype": "POS Setting",
+ "doctype": "POS Profile",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"income_account": "Sales - _TC",
- "name": "_Test POS Setting",
- "naming_series": "_T-POS Setting-",
+ "name": "_Test POS Profile",
+ "naming_series": "_T-POS Profile-",
"selling_price_list": "_Test Price List",
"territory": "_Test Territory",
"warehouse": "_Test Warehouse - _TC",
@@ -537,8 +538,8 @@
"write_off_cost_center": "_Test Write Off Cost Center - _TC"
})
- if not frappe.db.exists("POS Setting", "_Test POS Setting"):
- pos_setting.insert()
+ if not frappe.db.exists("POS Profile", "_Test POS Profile"):
+ pos_profile.insert()
def test_si_gl_entry_with_aii_and_update_stock_with_warehouse_but_no_account(self):
set_perpetual_inventory()
@@ -756,14 +757,27 @@
# hack! because stock ledger entires are already inserted and are not rolled back!
self.assertRaises(SerialNoDuplicateError, si.cancel)
+
+ def test_invoice_due_date_against_customers_credit_days(self):
+ # set customer's credit days
+ frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Fixed Days")
+ frappe.db.set_value("Customer", "_Test Customer", "credit_days", 10)
+
+ si = create_sales_invoice()
+ self.assertEqual(si.due_date, add_days(nowdate(), 10))
+
+ # set customer's credit days is last day of the next month
+ frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Last Day of the Next Month")
+
+ si1 = create_sales_invoice(posting_date="2015-07-05")
+ self.assertEqual(si1.due_date, "2015-08-31")
+
def create_sales_invoice(**args):
si = frappe.new_doc("Sales Invoice")
args = frappe._dict(args)
if args.posting_date:
- si.posting_date = args.posting_date
- if args.posting_time:
- si.posting_time = args.posting_time
+ si.posting_date = args.posting_date or nowdate()
si.company = args.company or "_Test Company"
si.customer = args.customer or "_Test Customer"
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 17e495f..6dcd591 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -58,7 +58,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -69,6 +69,23 @@
"width": "200px"
},
{
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "hidden": 1,
+ "label": "Image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1
+ },
+ {
"fieldname": "quantity_and_rate",
"fieldtype": "Section Break",
"label": "Quantity and Rate",
@@ -98,10 +115,11 @@
"reqd": 0
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount (%)",
+ "label": "Discount on Price List Rate (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
"permlevel": 0,
@@ -504,7 +522,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-03-23 14:56:45.641026",
+ "modified": "2015-07-02 02:59:08.413213",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 9b97e4b..17fe922 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -3,8 +3,9 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import flt, cstr
+from frappe.utils import flt, cstr, cint
from frappe import _
+from frappe.model.meta import get_field_precision
from erpnext.accounts.utils import validate_expense_against_budget
@@ -55,28 +56,23 @@
def check_if_in_list(gle, gl_map):
for e in gl_map:
- if e.account == gle.account and \
- cstr(e.get('against_voucher'))==cstr(gle.get('against_voucher')) \
- and cstr(e.get('against_voucher_type')) == \
- cstr(gle.get('against_voucher_type')) \
- and cstr(e.get('cost_center')) == cstr(gle.get('cost_center')):
- return e
+ if e.account == gle.account \
+ and cstr(e.get('party_type'))==cstr(gle.get('party_type')) \
+ and cstr(e.get('party'))==cstr(gle.get('party')) \
+ and cstr(e.get('against_voucher'))==cstr(gle.get('against_voucher')) \
+ and cstr(e.get('against_voucher_type')) == cstr(gle.get('against_voucher_type')) \
+ and cstr(e.get('cost_center')) == cstr(gle.get('cost_center')):
+ return e
def save_entries(gl_map, adv_adj, update_outstanding):
validate_account_for_auto_accounting_for_stock(gl_map)
-
- total_debit = total_credit = 0.0
+ round_off_debit_credit(gl_map)
+
for entry in gl_map:
make_entry(entry, adv_adj, update_outstanding)
# check against budget
validate_expense_against_budget(entry)
- # update total debit / credit
- total_debit += flt(entry.debit)
- total_credit += flt(entry.credit)
-
- validate_total_debit_credit(total_debit, total_credit, gl_map)
-
def make_entry(args, adv_adj, update_outstanding):
args.update({"doctype": "GL Entry"})
gle = frappe.get_doc(args)
@@ -85,18 +81,62 @@
gle.run_method("on_update_with_args", adv_adj, update_outstanding)
gle.submit()
-def validate_total_debit_credit(total_debit, total_credit, gl_map):
- if abs(total_debit - total_credit) > 0.005:
- frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.").format(gl_map[0].voucher_type, gl_map[0].voucher_no, total_debit - total_credit))
-
def validate_account_for_auto_accounting_for_stock(gl_map):
- if gl_map[0].voucher_type=="Journal Entry":
- aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
- where account_type = 'Warehouse' and ifnull(warehouse, '')!=''""")]
+ if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \
+ and gl_map[0].voucher_type=="Journal Entry":
+ aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
+ where account_type = 'Warehouse' and ifnull(warehouse, '')!=''""")]
- for entry in gl_map:
- if entry.account in aii_accounts:
- frappe.throw(_("Account: {0} can only be updated via Stock Transactions").format(entry.account), StockAccountInvalidTransaction)
+ for entry in gl_map:
+ if entry.account in aii_accounts:
+ frappe.throw(_("Account: {0} can only be updated via Stock Transactions")
+ .format(entry.account), StockAccountInvalidTransaction)
+
+def round_off_debit_credit(gl_map):
+ precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"),
+ currency=frappe.db.get_value("Company", gl_map[0].company, "default_currency", cache=True))
+
+ debit_credit_diff = 0.0
+ for entry in gl_map:
+ entry.debit = flt(entry.debit, precision)
+ entry.credit = flt(entry.credit, precision)
+ debit_credit_diff += entry.debit - entry.credit
+
+ debit_credit_diff = flt(debit_credit_diff, precision)
+ if abs(debit_credit_diff) >= (5.0 / (10**precision)):
+ frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.")
+ .format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))
+
+ elif abs(debit_credit_diff) >= (1.0 / (10**precision)):
+ make_round_off_gle(gl_map, debit_credit_diff)
+
+def make_round_off_gle(gl_map, debit_credit_diff):
+ round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company,
+ ["round_off_account", "round_off_cost_center"]) or [None, None]
+ if not round_off_account:
+ frappe.throw(_("Please mention Round Off Account in Company"))
+
+ if not round_off_cost_center:
+ frappe.throw(_("Please mention Round Off Cost Center in Company"))
+
+
+ round_off_gle = frappe._dict()
+ for k in ["voucher_type", "voucher_no", "company",
+ "posting_date", "remarks", "fiscal_year", "is_opening"]:
+ round_off_gle[k] = gl_map[0][k]
+
+ round_off_gle.update({
+ "account": round_off_account,
+ "debit": abs(debit_credit_diff) if debit_credit_diff < 0 else 0,
+ "credit": debit_credit_diff if debit_credit_diff > 0 else 0,
+ "cost_center": round_off_cost_center,
+ "party_type": None,
+ "party": None,
+ "against_voucher_type": None,
+ "against_voucher": None
+ })
+
+ gl_map.append(round_off_gle)
def delete_gl_entries(gl_entries=None, voucher_type=None, voucher_no=None,
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index 49b5c25..cb36d05 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -55,7 +55,7 @@
.change(function() {
var ctype = frappe.get_route()[1] || 'Account';
erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(),
- chart_area.get(0));
+ chart_area.get(0), wrapper.page);
})
// load up companies
@@ -75,19 +75,23 @@
// set route
var ctype = frappe.get_route()[1] || 'Account';
+
+
if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
wrapper.$company_select.change();
}
}
erpnext.AccountsChart = Class.extend({
- init: function(ctype, company, wrapper) {
+ init: function(ctype, company, wrapper, page) {
$(wrapper).empty();
var me = this;
me.ctype = ctype;
me.can_create = frappe.model.can_create(this.ctype);
me.can_delete = frappe.model.can_delete(this.ctype);
me.can_write = frappe.model.can_write(this.ctype);
+ me.page = page;
+ me.set_title();
// __("Accounts"), __("Cost Centers")
@@ -169,9 +173,9 @@
set_title: function(val) {
var chart_str = this.ctype=="Account" ? __("Chart of Accounts") : __("Chart of Cost Centers");
if(val) {
- wrapper.page.set_title(chart_str + " - " + cstr(val));
+ this.page.set_title(chart_str + " - " + cstr(val));
} else {
- wrapper.page.set_title(chart_str);
+ this.page.set_title(chart_str);
}
},
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 1bc5681..df7757b 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -35,7 +35,7 @@
});
$.ajax({
- url: "/api/resource/POS Setting",
+ url: "/api/resource/POS Profile",
success: function(data) {
if(!data.data.length) {
page.main.find(".pos-setting-message").removeClass('hide');
diff --git a/erpnext/accounts/page/pos/pos_page.html b/erpnext/accounts/page/pos/pos_page.html
index 98cce00..5a4c538 100644
--- a/erpnext/accounts/page/pos/pos_page.html
+++ b/erpnext/accounts/page/pos/pos_page.html
@@ -9,7 +9,7 @@
<button class="btn btn-primary btn-lg">{%= __("Start") %}</button>
</p>
<p class="pos-setting-message hide">
- <a class="btn btn-default btn-sm" href="#Form/POS Setting/New POS Setting">
- {%= __("Make new POS Setting") %}</a>
+ <a class="btn btn-default btn-sm" href="#Form/POS Profile/New POS Profile">
+ {%= __("Make new POS Profile") %}</a>
</p>
</div>
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 00e595f..250286c 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -4,9 +4,10 @@
from __future__ import unicode_literals
import frappe
+import datetime
from frappe import _, msgprint, scrub
from frappe.defaults import get_user_permissions
-from frappe.utils import add_days, getdate, formatdate, flt
+from frappe.utils import add_days, getdate, formatdate, flt, get_first_day, date_diff, nowdate
from erpnext.utilities.doctype.address.address import get_address_display
from erpnext.utilities.doctype.contact.contact import get_contact_details
@@ -16,12 +17,16 @@
if not party:
return {}
+
+ if not frappe.db.exists(party_type, party):
+ frappe.throw(_("{0}: {1} does not exists").format(party_type, party))
return _get_party_details(party, account, party_type,
company, posting_date, price_list, currency, doctype)
def _get_party_details(party=None, account=None, party_type="Customer", company=None,
posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False):
+
out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, doctype))
party = out[party_type.lower()]
@@ -69,9 +74,17 @@
{party_type.lower(): party.name, "is_primary_contact":1}, "name")
if not out.contact_person:
- return
-
- out.update(get_contact_details(out.contact_person))
+ out.update({
+ "contact_person": None,
+ "contact_display": None,
+ "contact_email": None,
+ "contact_mobile": None,
+ "contact_phone": None,
+ "contact_designation": None,
+ "contact_department": None
+ })
+ else:
+ out.update(get_contact_details(out.contact_person))
def set_other_values(out, party, party_type):
# copy
@@ -154,43 +167,54 @@
return account
+@frappe.whitelist()
def get_due_date(posting_date, party_type, party, company):
"""Set Due Date = Posting Date + Credit Days"""
due_date = None
- if posting_date:
- credit_days = get_credit_days(party_type, party, company)
- due_date = add_days(posting_date, credit_days) if credit_days else posting_date
-
+ if posting_date and party:
+ due_date = posting_date
+ if party_type=="Customer":
+ credit_days_based_on, credit_days = get_credit_days(party_type, party, company)
+ if credit_days_based_on == "Fixed Days" and credit_days:
+ due_date = add_days(posting_date, credit_days)
+ elif credit_days_based_on == "Last Day of the Next Month":
+ due_date = (get_first_day(posting_date, 0, 2) + datetime.timedelta(-1)).strftime("%Y-%m-%d")
+ else:
+ credit_days = get_credit_days(party_type, party, company)
+ if credit_days:
+ due_date = add_days(posting_date, credit_days)
+
return due_date
def get_credit_days(party_type, party, company):
- if not party:
- return None
-
- party_group_doctype = "Customer Group" if party_type=="Customer" else "Supplier Type"
- credit_days, party_group = frappe.db.get_value(party_type, party, ["credit_days", frappe.scrub(party_group_doctype)])
-
- if not credit_days:
- credit_days = frappe.db.get_value(party_group_doctype, party_group, "credit_days") or \
- frappe.db.get_value("Company", company, "credit_days")
-
- return credit_days
-
-def validate_due_date(posting_date, due_date, party_type, party, company):
- credit_days = get_credit_days(party_type, party, company)
-
- posting_date, due_date = getdate(posting_date), getdate(due_date)
- diff = (due_date - posting_date).days
-
- if diff < 0:
- frappe.throw(_("Due Date cannot be before Posting Date"))
- elif credit_days is not None and diff > flt(credit_days):
- is_credit_controller = frappe.db.get_value("Accounts Settings", None,
- "credit_controller") in frappe.get_roles()
-
- if is_credit_controller:
- msgprint(_("Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)")
- .format(diff - flt(credit_days)))
+ if party_type and party:
+ if party_type == "Customer":
+ credit_days_based_on, credit_days, customer_group = \
+ frappe.db.get_value(party_type, party, ["credit_days_based_on", "credit_days", "customer_group"])
+
+ if not credit_days_based_on:
+ credit_days_based_on, credit_days = \
+ frappe.db.get_value("Customer Group", customer_group, ["credit_days_based_on", "credit_days"]) \
+ or frappe.db.get_value("Company", company, ["credit_days_based_on", "credit_days"])
+
+ return credit_days_based_on, credit_days
else:
- max_due_date = formatdate(add_days(posting_date, credit_days))
- frappe.throw(_("Due / Reference Date cannot be after {0}").format(max_due_date))
+ credit_days, supplier_type = frappe.db.get_value(party_type, party, ["credit_days", "supplier_type"])
+ if not credit_days:
+ credit_days = frappe.db.get_value("Supplier Type", supplier_type, "credit_days") \
+ or frappe.db.get_value("Company", company, "credit_days")
+
+ return credit_days
+
+def validate_due_date(posting_date, due_date, party_type, party, company):
+ if getdate(due_date) < getdate(posting_date):
+ frappe.throw(_("Due Date cannot be before Posting Date"))
+ else:
+ default_due_date = get_due_date(posting_date, party_type, party, company)
+ if default_due_date != posting_date and getdate(due_date) > getdate(default_due_date):
+ is_credit_controller = frappe.db.get_single_value("Accounts Settings", "credit_controller") in frappe.get_roles()
+ if is_credit_controller:
+ msgprint(_("Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)")
+ .format(date_diff(due_date, default_due_date)))
+ else:
+ frappe.throw(_("Due / Reference Date cannot be after {0}").format(formatdate(default_due_date)))
\ No newline at end of file
diff --git a/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json b/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
index 9421d45..8c9c266 100755
--- a/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
+++ b/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
@@ -1,15 +1,15 @@
{
- "creation": "2012-04-11 13:16:56",
- "doc_type": "Journal Entry",
- "docstatus": 0,
- "doctype": "Print Format",
- "html": "<div style=\"position: relative\">\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n{%- for label, value in (\n (_(\"Voucher Date\"), frappe.utils.formatdate(doc.voucher_date)),\n (_(\"Reference / Cheque No.\"), doc.cheque_no),\n (_(\"Reference / Cheque Date\"), frappe.utils.formatdate(doc.cheque_date))\n ) -%}\n <div class=\"row\">\n <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-xs-8\">{{ value }}</div>\n </div>\n{%- endfor -%}\n\t<hr>\n\t<p>{{ _(\"This amount is in full / part settlement of the listed bills\") }}:</p>\n{%- for label, value in (\n (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n (_(\"References\"), doc.remark)\n ) -%}\n <div class=\"row\">\n <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-xs-8\">{{ value }}</div>\n </div>\n {%- endfor -%}\n <hr>\n\t<div style=\"position: absolute; top: 14cm; left: 0cm;\">\n\t\tPrepared By</div>\n\t<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">\n\t\tAuthorised Signatory</div>\n\t<div style=\"position: absolute; top: 14cm; left: 11cm;\">\n\t\tReceived Payment as Above</div>\n\t<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 6cm;\">\n\t\t<strong>A/C Payee</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n\t\t{{ doc.pay_to_recd_from }}</div>\n\t<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n\t\t{{ doc.total_amount_in_words }}</div>\n\t<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n\t\t{{ doc.total_amount }}</div>\n</div>",
- "idx": 1,
- "modified": "2015-01-12 11:03:17.032512",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cheque Printing Format",
- "owner": "Administrator",
- "print_format_type": "Server",
+ "creation": "2012-04-11 13:16:56",
+ "custom_format": 1,
+ "doc_type": "Journal Entry",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "html": "<div style=\"position: relative\">\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n{%- for label, value in (\n (_(\"Voucher Date\"), frappe.utils.formatdate(doc.voucher_date)),\n (_(\"Reference / Cheque No.\"), doc.cheque_no),\n (_(\"Reference / Cheque Date\"), frappe.utils.formatdate(doc.cheque_date))\n ) -%}\n <div class=\"row\">\n <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-xs-8\">{{ value }}</div>\n </div>\n{%- endfor -%}\n\t<hr>\n\t<p>{{ _(\"This amount is in full / part settlement of the listed bills\") }}:</p>\n{%- for label, value in (\n (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n (_(\"References\"), doc.remark)\n ) -%}\n <div class=\"row\">\n <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-xs-8\">{{ value }}</div>\n </div>\n {%- endfor -%}\n <hr>\n\t<div style=\"position: absolute; top: 14cm; left: 0cm;\">\n\t\tPrepared By</div>\n\t<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">\n\t\tAuthorised Signatory</div>\n\t<div style=\"position: absolute; top: 14cm; left: 11cm;\">\n\t\tReceived Payment as Above</div>\n\t<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 6cm;\">\n\t\t<strong>A/C Payee</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n\t\t{{ doc.pay_to_recd_from }}</div>\n\t<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n\t\t{{ doc.total_amount_in_words }}</div>\n\t<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n\t\t{{ doc.get_formatted(\"total_amount\") }}</div>\n</div>",
+ "idx": 1,
+ "modified": "2015-05-29 01:57:51.203850",
+ "modified_by": "Administrator",
+ "name": "Cheque Printing Format",
+ "owner": "Administrator",
+ "print_format_type": "Server",
"standard": "Yes"
-}
+}
\ 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 52c9760..19703be 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -51,7 +51,7 @@
currency_precision = get_currency_precision() or 2
dr_or_cr = "debit" if args.get("party_type") == "Customer" else "credit"
- voucher_details = self.get_voucher_details()
+ voucher_details = self.get_voucher_details(args.get("party_type"))
future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
@@ -153,23 +153,26 @@
return self.party_map
- def get_voucher_details(self):
+ def get_voucher_details(self, party_type):
voucher_details = frappe._dict()
+
+ if party_type == "Customer":
+ for si in frappe.db.sql("""select name, due_date
+ from `tabSales Invoice` where docstatus=1""", as_dict=1):
+ voucher_details.setdefault(si.name, si)
- for si in frappe.db.sql("""select name, due_date
- from `tabSales Invoice` where docstatus=1""", as_dict=1):
- voucher_details.setdefault(si.name, si)
-
- for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date
- from `tabPurchase Invoice` where docstatus=1""", as_dict=1):
- voucher_details.setdefault(pi.name, pi)
+ if party_type == "Supplier":
+ for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date
+ from `tabPurchase Invoice` where docstatus=1""", as_dict=1):
+ voucher_details.setdefault(pi.name, pi)
return voucher_details
def get_gl_entries(self, party_type):
if not hasattr(self, "gl_entries"):
conditions, values = self.prepare_conditions(party_type)
- self.gl_entries = frappe.db.sql("""select * from `tabGL Entry`
+ self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, debit, credit,
+ voucher_type, voucher_no, against_voucher_type, against_voucher from `tabGL Entry`
where docstatus < 2 and party_type=%s {0} order by posting_date, party"""
.format(conditions), values, as_dict=True)
@@ -187,7 +190,7 @@
if self.filters.get(party_type_field):
conditions.append("party=%s")
- values.append(self.filters.get(party_type_field))
+ values.append(self.filters.get(party_type_field))
return " and ".join(conditions), values
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index 168f9b1..65d429c 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -29,7 +29,7 @@
def get_provisional_profit_loss(asset, liability, equity, period_list):
if asset and (liability or equity):
provisional_profit_loss = {
- "account_name": _("Provisional Profit / Loss (Credit)"),
+ "account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
"account": None,
"warn_if_negative": True
}
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 8f4b2ca..e592f69 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -38,7 +38,7 @@
data += [
get_balance_row(_("System Balance"), balance_as_per_system),
[""]*len(columns),
- ["", _("Amounts not reflected in bank"), total_debit, total_credit, "", "", "", ""],
+ ["", '"' + _("Amounts not reflected in bank") + '"', total_debit, total_credit, "", "", "", ""],
get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system),
[""]*len(columns),
get_balance_row(_("Expected balance as per bank"), bank_bal)
@@ -68,6 +68,6 @@
def get_balance_row(label, amount):
if amount > 0:
- return ["", label, amount, 0, "", "", "", ""]
+ return ["", '"' + label + '"', amount, 0, "", "", "", ""]
else:
- return ["", label, 0, abs(amount), "", "", "", ""]
+ return ["", '"' + label + '"', 0, abs(amount), "", "", "", ""]
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 88d1beb..be2e968 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -83,7 +83,7 @@
gl_entries_by_account = get_gl_entries(company, period_list[0]["from_date"], period_list[-1]["to_date"],
accounts[0].lft, accounts[0].rgt, ignore_closing_entries=ignore_closing_entries)
- calculate_values(accounts, gl_entries_by_account, period_list)
+ calculate_values(accounts_by_name, gl_entries_by_account, period_list)
accumulate_values_into_parents(accounts, accounts_by_name, period_list)
out = prepare_data(accounts, balance_must_be, period_list)
@@ -92,16 +92,14 @@
return out
-def calculate_values(accounts, gl_entries_by_account, period_list):
- for d in accounts:
- for name in ([d.name] + (d.collapsed_children or [])):
- for entry in gl_entries_by_account.get(name, []):
- for period in period_list:
- entry.posting_date = getdate(entry.posting_date)
-
- # check if posting date is within the period
- if entry.posting_date <= period.to_date:
- d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
+def calculate_values(accounts_by_name, gl_entries_by_account, period_list):
+ for entries in gl_entries_by_account.values():
+ for entry in entries:
+ d = accounts_by_name.get(entry.account)
+ for period in period_list:
+ # check if posting date is within the period
+ if entry.posting_date <= period.to_date:
+ d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
def accumulate_values_into_parents(accounts, accounts_by_name, period_list):
@@ -146,7 +144,7 @@
def add_total_row(out, balance_must_be, period_list):
row = {
- "account_name": _("Total ({0})").format(balance_must_be),
+ "account_name": "'" + _("Total ({0})").format(balance_must_be) + "'",
"account": None
}
for period in period_list:
@@ -159,22 +157,8 @@
out.append({})
def get_accounts(company, root_type):
- # root lft, rgt
- root_account = frappe.db.sql("""select lft, rgt from `tabAccount`
- where company=%s and root_type=%s and ifnull(parent_account, '') = ''
- order by lft limit 1""",
- (company, root_type), as_dict=True)
-
- if not root_account:
- return None
-
- lft, rgt = root_account[0].lft, root_account[0].rgt
-
- accounts = frappe.db.sql("""select * from `tabAccount`
- where company=%(company)s and lft >= %(lft)s and rgt <= %(rgt)s order by lft""",
- { "company": company, "lft": lft, "rgt": rgt }, as_dict=True)
-
- return accounts
+ return frappe.db.sql("""select name, parent_account, lft, rgt, root_type, report_type, account_name from `tabAccount`
+ where company=%s and root_type=%s order by lft""", (company, root_type), as_dict=True)
def filter_accounts(accounts, depth=10):
parent_children_map = {}
@@ -196,18 +180,10 @@
filtered_accounts.append(child)
add_to_list(child.name, level + 1)
- else:
- # include all children at level lower than the depth
- parent_account = accounts_by_name[parent]
- parent_account["collapsed_children"] = []
- for d in accounts:
- if d.lft > parent_account.lft and d.rgt < parent_account.rgt:
- parent_account["collapsed_children"].append(d.name)
-
add_to_list(None, 0)
return filtered_accounts, accounts_by_name
-
+
def sort_root_accounts(roots):
"""Sort root types as Asset, Liability, Equity, Income, Expense"""
@@ -234,7 +210,7 @@
if from_date:
additional_conditions.append("and posting_date >= %(from_date)s")
- gl_entries = frappe.db.sql("""select * from `tabGL Entry`
+ gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening from `tabGL Entry`
where company=%(company)s
{additional_conditions}
and posting_date <= %(to_date)s
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index 5c6b0f1..0d3170a 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -2,7 +2,7 @@
{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
</div>
<h2 class="text-center">{%= __("Statement of Account") %}</h2>
-<h4 class="text-center">{%= filters.account && (filters.account + ", ") || "" %} {%= filters.company %}</h4>
+<h4 class="text-center">{%= (filters.party || filters.account) && ((filters.party || filters.account) + ", ") || "" %} {%= filters.company %}</h4>
<h5 class="text-center">
{%= dateutil.str_to_user(filters.from_date) %}
{%= __("to") %}
@@ -26,15 +26,20 @@
<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
<td>{%= data[i][__("Voucher Type")] %}
<br>{%= data[i][__("Voucher No")] %}</td>
- <td>{%= data[i][__("Account")] %}
- <br>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
+ <td>
+ {% if(!(filters.party || filters.account)) { %}
+ {%= data[i][__("Party")] || data[i][__("Account")] %}
+ <br>
+ {% } %}
+
+ {{ __("Against") }}: {%= data[i][__("Against Account")] %}
<br>{%= __("Remarks") %}: {%= data[i][__("Remarks")] %}</td>
<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
{% } else { %}
<td></td>
<td></td>
- <td><b>{%= data[i][__("Account")] || " " %}</b></td>
+ <td><b>{%= frappe.format(data[i][__("Account")], {fieldtype: "Link"}) || " " %}</b></td>
<td style="text-align: right">
{%= data[i][__("Account")] && format_currency(data[i][__("Debit")]) %}</td>
<td style="text-align: right">
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 7cc990c..de7027b 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -53,13 +53,9 @@
{
"fieldname":"party_type",
"label": __("Party Type"),
- "fieldtype": "Link",
- "options": "DocType",
- "get_query": function() {
- return {
- filters: {"name": ["in", ["Customer", "Supplier"]]}
- }
- }
+ "fieldtype": "Select",
+ "options": ["", "Customer", "Supplier"],
+ "default": ""
},
{
"fieldname":"party",
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 2731baa..35c839f 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -3,13 +3,13 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import flt, getdate
+from frappe.utils import flt, getdate, cstr
from frappe import _
def execute(filters=None):
account_details = {}
for acc in frappe.db.sql("""select name, is_group from tabAccount""", as_dict=1):
- account_details.setdefault(acc.name, acc)
+ account_details.setdefault(acc.name, acc)
validate_filters(filters, account_details)
validate_party(filters)
@@ -66,7 +66,7 @@
gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit,
- voucher_type, voucher_no, cost_center, remarks, is_opening, against
+ voucher_type, voucher_no, cost_center, remarks, against, is_opening
from `tabGL Entry`
where company=%(company)s {conditions}
{group_by_condition}
@@ -82,8 +82,6 @@
lft, rgt = frappe.db.get_value("Account", filters["account"], ["lft", "rgt"])
conditions.append("""account in (select name from tabAccount
where lft>=%s and rgt<=%s and docstatus<2)""" % (lft, rgt))
- else:
- conditions.append("posting_date between %(from_date)s and %(to_date)s")
if filters.get("voucher_no"):
conditions.append("voucher_no=%(voucher_no)s")
@@ -93,6 +91,9 @@
if filters.get("party"):
conditions.append("party=%(party)s")
+
+ if not (filters.get("account") or filters.get("party") or filters.get("group_by_account")):
+ conditions.append("posting_date >=%(from_date)s")
from frappe.desk.reportview import build_match_conditions
match_conditions = build_match_conditions("GL Entry")
@@ -107,31 +108,31 @@
opening, total_debit, total_credit, gle_map = get_accountwise_gle(filters, gl_entries, gle_map)
# Opening for filtered account
- if filters.get("account"):
- data += [get_balance_row("Opening", opening), {}]
+ if filters.get("account") or filters.get("party"):
+ data += [get_balance_row(_("Opening"), opening), {}]
for acc, acc_dict in gle_map.items():
if acc_dict.entries:
# Opening for individual ledger, if grouped by account
if filters.get("group_by_account"):
- data.append(get_balance_row("Opening", acc_dict.opening))
+ data.append(get_balance_row(_("Opening"), acc_dict.opening))
data += acc_dict.entries
# Totals and closing for individual ledger, if grouped by account
if filters.get("group_by_account"):
- data += [{"account": "Totals", "debit": acc_dict.total_debit,
+ data += [{"account": "'" + _("Totals") + "'", "debit": acc_dict.total_debit,
"credit": acc_dict.total_credit},
- get_balance_row("Closing (Opening + Totals)",
+ get_balance_row(_("Closing (Opening + Totals)"),
(acc_dict.opening + acc_dict.total_debit - acc_dict.total_credit)), {}]
# Total debit and credit between from and to date
if total_debit or total_credit:
- data.append({"account": "Totals", "debit": total_debit, "credit": total_credit})
+ data.append({"account": "'" + _("Totals") + "'", "debit": total_debit, "credit": total_credit})
# Closing for filtered account
- if filters.get("account"):
- data.append(get_balance_row("Closing (Opening + Totals)",
+ if filters.get("account") or filters.get("party"):
+ data.append(get_balance_row(_("Closing (Opening + Totals)"),
(opening + total_debit - total_credit)))
return data
@@ -150,13 +151,15 @@
def get_accountwise_gle(filters, gl_entries, gle_map):
opening, total_debit, total_credit = 0, 0, 0
-
+ from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
for gle in gl_entries:
amount = flt(gle.debit, 3) - flt(gle.credit, 3)
- if filters.get("account") and gle.posting_date < getdate(filters.from_date):
+ if (filters.get("account") or filters.get("party") or filters.get("group_by_account")) \
+ and (gle.posting_date < from_date or cstr(gle.is_opening) == "Yes"):
gle_map[gle.account].opening += amount
- opening += amount
- elif gle.posting_date <= getdate(filters.to_date):
+ if filters.get("account") or filters.get("party"):
+ opening += amount
+ elif gle.posting_date <= to_date:
gle_map[gle.account].entries.append(gle)
gle_map[gle.account].total_debit += flt(gle.debit, 3)
gle_map[gle.account].total_credit += flt(gle.credit, 3)
@@ -168,7 +171,7 @@
def get_balance_row(label, balance):
return {
- "account": label,
+ "account": "'" + label + "'",
"debit": balance if balance > 0 else 0,
"credit": -1*balance if balance < 0 else 0,
}
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 5ede882..8153912 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -14,7 +14,7 @@
source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data
group_wise_columns = frappe._dict({
- "invoice": ["name", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \
+ "invoice": ["parent", "customer", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \
"warehouse", "qty", "base_rate", "buying_rate", "base_amount",
"buying_amount", "gross_profit", "gross_profit_percent", "project"],
"item_code": ["item_code", "item_name", "brand", "description", "warehouse", "qty", "base_rate",
@@ -50,7 +50,7 @@
def get_columns(group_wise_columns, filters):
columns = []
column_map = frappe._dict({
- "name": _("Sales Invoice") + ":Link/Sales Invoice:120",
+ "parent": _("Sales Invoice") + ":Link/Sales Invoice:120",
"posting_date": _("Posting Date") + ":Date",
"posting_time": _("Posting Time"),
"item_code": _("Item Code") + ":Link/Item",
@@ -86,23 +86,23 @@
self.filters = frappe._dict(filters)
self.load_invoice_items()
self.load_stock_ledger_entries()
- self.load_sales_bom()
+ self.load_product_bundle()
self.load_non_stock_items()
self.process()
def process(self):
self.grouped = {}
for row in self.si_list:
- if self.skip_row(row, self.sales_boms):
+ if self.skip_row(row, self.product_bundles):
continue
row.base_amount = flt(row.base_net_amount)
- sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.name, frappe._dict())
+ product_bundles = self.product_bundles.get(row.parenttype, {}).get(row.parent, frappe._dict())
# get buying amount
- if row.item_code in sales_boms:
- row.buying_amount = self.get_buying_amount_from_sales_bom(row, sales_boms[row.item_code])
+ if row.item_code in product_bundles:
+ row.buying_amount = self.get_buying_amount_from_product_bundle(row, product_bundles[row.item_code])
else:
row.buying_amount = self.get_buying_amount(row, row.item_code)
@@ -152,13 +152,13 @@
self.grouped_data.append(new_row)
- def skip_row(self, row, sales_boms):
+ def skip_row(self, row, product_bundles):
if self.filters.get("group_by") != "Invoice" and not row.get(scrub(self.filters.get("group_by"))):
return True
- def get_buying_amount_from_sales_bom(self, row, sales_bom):
+ def get_buying_amount_from_product_bundle(self, row, product_bundle):
buying_amount = 0.0
- for bom_item in sales_bom[row.item_code]:
+ for bom_item in product_bundle:
if bom_item.get("parent_detail_docname")==row.item_row:
buying_amount += self.get_buying_amount(row, bom_item.item_code)
@@ -174,16 +174,16 @@
return flt(row.qty) * item_rate
else:
- if row.dn_detail:
- row.parenttype = "Delivery Note"
- row.parent = row.delivery_note
- row.item_row = row.dn_detail
+ if row.update_stock or row.dn_detail:
+ parenttype, parent, item_row = row.parenttype, row.parent, row.item_row
+ if row.dn_detail:
+ parenttype, parent, item_row = "Delivery Note", row.delivery_note, row.dn_detail
my_sle = self.sle.get((item_code, row.warehouse))
for i, sle in enumerate(my_sle):
# find the stock valution rate from stock ledger entry
- if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \
- sle.voucher_detail_no == row.item_row:
+ if sle.voucher_type == parenttype and parent == sle.voucher_no and \
+ sle.voucher_detail_no == item_row:
previous_stock_value = len(my_sle) > i+1 and \
flt(my_sle[i+1].stock_value) or 0.0
return previous_stock_value - flt(sle.stock_value)
@@ -215,7 +215,7 @@
if self.filters.to_date:
conditions += " and posting_date <= %(to_date)s"
- self.si_list = frappe.db.sql("""select item.parenttype, si.name,
+ self.si_list = frappe.db.sql("""select item.parenttype, item.parent,
si.posting_date, si.posting_time, si.project_name, si.update_stock,
si.customer, si.customer_group, si.territory,
item.item_code, item.item_name, item.description, item.warehouse,
@@ -246,13 +246,13 @@
self.sle[(r.item_code, r.warehouse)].append(r)
- def load_sales_bom(self):
- self.sales_boms = {}
+ def load_product_bundle(self):
+ self.product_bundles = {}
for d in frappe.db.sql("""select parenttype, parent, parent_item,
item_code, warehouse, -1*qty as total_qty, parent_detail_docname
from `tabPacked Item` where docstatus=1""", as_dict=True):
- self.sales_boms.setdefault(d.parenttype, frappe._dict()).setdefault(d.parent,
+ self.product_bundles.setdefault(d.parenttype, frappe._dict()).setdefault(d.parent,
frappe._dict()).setdefault(d.parent_item, []).append(d)
def load_non_stock_items(self):
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 f54b860..bcb128b 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
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from frappe import msgprint, _
+from frappe import _
from frappe.utils import flt
def execute(filters=None):
@@ -23,7 +23,7 @@
purchase_receipt = d.purchase_receipt
elif d.po_detail:
purchase_receipt = ", ".join(frappe.db.sql_list("""select distinct parent
- from `tabPurchase Receipt Item` where docstatus=1 and po_detail=%s""", d.po_detail))
+ from `tabPurchase Receipt Item` where docstatus=1 and prevdoc_detail_docname=%s""", d.po_detail))
expense_account = d.expense_account or aii_account_map.get(d.company)
row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.supplier,
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
index fd03cc3..952540c 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
@@ -4,6 +4,14 @@
frappe.query_reports["Payment Period Based On Invoice Date"] = {
"filters": [
{
+ fieldname:"company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("company")
+ },
+ {
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
@@ -23,27 +31,28 @@
default: "Incoming"
},
{
- fieldname:"account",
- label: __("Account"),
- fieldtype: "Link",
- options: "Account",
- get_query: function() {
+ "fieldname":"party_type",
+ "label": __("Party Type"),
+ "fieldtype": "Link",
+ "options": "DocType",
+ "get_query": function() {
return {
- query: "erpnext.controllers.queries.get_account_list",
- filters: {
- "report_type": "Balance Sheet",
- company: frappe.query_report.filters_by_name.company.get_value()
- }
+ filters: {"name": ["in", ["Customer", "Supplier"]]}
}
}
},
{
- fieldname:"company",
- label: __("Company"),
- fieldtype: "Link",
- options: "Company",
- reqd: 1,
- default: frappe.defaults.get_user_default("company")
+ "fieldname":"party",
+ "label": __("Party"),
+ "fieldtype": "Dynamic Link",
+ "get_options": function() {
+ var party_type = frappe.query_report.filters_by_name.party_type.get_value();
+ var party = frappe.query_report.filters_by_name.party.get_value();
+ if(party && !party_type) {
+ frappe.throw(__("Please select Party Type first"));
+ }
+ return party_type;
+ }
},
]
}
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index fdd6e1a..3c8f550 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -9,8 +9,9 @@
def execute(filters=None):
if not filters: filters = {}
-
- columns = get_columns()
+ validate_filters(filters)
+
+ columns = get_columns(filters)
entries = get_entries(filters)
invoice_posting_date_map = get_invoice_posting_date_map(filters)
against_date = ""
@@ -20,67 +21,72 @@
for d in entries:
if d.against_voucher:
against_date = d.against_voucher and invoice_posting_date_map[d.against_voucher] or ""
- outstanding_amount = flt(d.debit) or -1 * flt(d.credit)
+ payment_amount = flt(d.debit) or -1 * flt(d.credit)
else:
against_date = d.against_invoice and invoice_posting_date_map[d.against_invoice] or ""
- outstanding_amount = flt(d.credit) or -1 * flt(d.debit)
+ payment_amount = flt(d.credit) or -1 * flt(d.debit)
- row = [d.name, d.account, d.posting_date, d.against_voucher or d.against_invoice,
+ row = [d.name, d.party_type, d.party, d.posting_date, d.against_voucher or d.against_invoice,
against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
if d.against_voucher or d.against_invoice:
- row += get_ageing_data(30, 60, 90, d.posting_date, against_date, outstanding_amount)
+ row += get_ageing_data(30, 60, 90, d.posting_date, against_date, payment_amount)
else:
row += ["", "", "", "", ""]
data.append(row)
return columns, data
+
+def validate_filters(filters):
+ if (filters.get("payment_type") == "Incoming" and filters.get("party_type") == "Supplier") or \
+ (filters.get("payment_type") == "Outgoing" and filters.get("party_type") == "Customer"):
+ frappe.throw(_("{0} payment entries can not be filtered by {1}")\
+ .format(filters.payment_type, filters.party_type))
-def get_columns():
- return [_("Journal Entry") + ":Link/Journal Entry:140", _("Account") + ":Link/Account:140",
- _("Posting Date") + ":Date:100", _("Against Invoice") + ":Link/Purchase Invoice:130",
+def get_columns(filters):
+ return [_("Journal Entry") + ":Link/Journal Entry:140",
+ _("Party Type") + ":Link/DocType:100", _("Party") + ":Dynamic Link/Party Type:140",
+ _("Posting Date") + ":Date:100",
+ _("Against Invoice") + (":Link/Purchase Invoice:130" if filters.get("payment_type") == "Outgoing" else ":Link/Sales Invoice:130"),
_("Against Invoice Posting Date") + ":Date:130", _("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
_("Reference No") + "::100", _("Reference Date") + ":Date:100", _("Remarks") + "::150", _("Age") +":Int:40",
"0-30:Currency:100", "30-60:Currency:100", "60-90:Currency:100", _("90-Above") + ":Currency:100"
]
def get_conditions(filters):
- conditions = ""
- party = None
+ conditions = []
- if filters.get("account"):
- party = filters["account"]
- else:
- conditions += " and company = '%s'" % frappe.db.escape(filters["company"])
+ if not filters.get("party_type"):
+ if filters.get("payment_type") == "Outgoing":
+ filters["party_type"] = "Supplier"
+ else:
+ filters["party_type"] = "Customer"
+
+ if filters.get("party_type"):
+ conditions.append("jvd.party_type=%(party_type)s")
- account_type = "Receivable" if filters.get("payment_type") == "Incoming" else "Payable"
+ if filters.get("party"):
+ conditions.append("jvd.party=%(party)s")
- conditions += """ and account in
- (select name from tabAccount
- where account_type = '{0}'
- and company='{1}')""".format(account_type, frappe.db.escape(filters["company"]))
-
- if party:
- conditions += " and jvd.party = '%s'" % frappe.db.escape(party)
- else:
- conditions += " and ifnull(jvd.party, '') != ''"
+ if filters.get("company"):
+ conditions.append("jv.company=%(company)s")
if filters.get("from_date"):
- conditions += " and jv.posting_date >= '%s'" % filters["from_date"]
+ conditions.append("jv.posting_date >= %(from_date)s")
if filters.get("to_date"):
- conditions += " and jv.posting_date <= '%s'" % filters["to_date"]
+ conditions.append("jv.posting_date <= %(to_date)s")
- return conditions
+ return "and {}".format(" and ".join(conditions)) if conditions else ""
def get_entries(filters):
conditions = get_conditions(filters)
- entries = frappe.db.sql("""select jv.name, jvd.account, jv.posting_date,
+ entries = frappe.db.sql("""select jv.name, jvd.party_type, jvd.party, jv.posting_date,
jvd.against_voucher, jvd.against_invoice, jvd.debit, jvd.credit,
jv.cheque_no, jv.cheque_date, jv.remark
from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
where jvd.parent = jv.name and jv.docstatus=1 %s order by jv.name DESC""" %
- conditions, as_dict=1, debug=1)
+ conditions, filters, as_dict=1)
return entries
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index 1d13376..0431eb6 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -27,7 +27,7 @@
def get_net_profit_loss(income, expense, period_list):
if income and expense:
net_profit_loss = {
- "account_name": _("Net Profit / Loss"),
+ "account_name": "'" + _("Net Profit / Loss") + "'",
"account": None,
"warn_if_negative": True
}
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
index 7d34413..6f80029 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -12,7 +12,6 @@
invoice_list = get_invoices(filters)
columns, expense_accounts, tax_accounts = get_columns(invoice_list)
-
if not invoice_list:
msgprint(_("No record found"))
return columns, invoice_list
@@ -30,7 +29,8 @@
purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))
- row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, supplier_details.get(inv.supplier),
+ row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name,
+ supplier_details.get(inv.supplier),
inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks,
", ".join(purchase_order), ", ".join(purchase_receipt)]
@@ -54,8 +54,7 @@
# total tax, grand total, outstanding amount & rounded total
row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount]
- data.append(row)
- # raise Exception
+ data.append(row)
return columns, data
@@ -107,7 +106,7 @@
def get_invoices(filters):
conditions = get_conditions(filters)
- return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name
+ return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name,
bill_no, bill_date, remarks, base_net_total, base_grand_total, outstanding_amount
from `tabPurchase Invoice` where docstatus = 1 %s
order by posting_date desc, name desc""" % conditions, filters, as_dict=1)
@@ -144,7 +143,7 @@
return invoice_expense_map, invoice_tax_map
def get_invoice_po_pr_map(invoice_list):
- pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail
+ pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail,
project_name from `tabPurchase Invoice Item` where parent in (%s)
and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
@@ -160,7 +159,7 @@
pr_list = [d.purchase_receipt]
elif d.po_detail:
pr_list = frappe.db.sql_list("""select distinct parent from `tabPurchase Receipt Item`
- where docstatus=1 and po_detail=%s""", d.pr_detail)
+ where docstatus=1 and prevdoc_detail_docname=%s""", d.po_detail)
if pr_list:
invoice_po_pr_map.setdefault(d.parent, frappe._dict()).setdefault("purchase_receipt", pr_list)
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 79a54ae..ffb274c 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -30,7 +30,8 @@
delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", [])))
row = [inv.name, inv.posting_date, inv.customer, inv.customer_name,
- customer_map.get(inv.customer)["customer_group"], customer_map.get(inv.customer)["territory"],
+ customer_map.get(inv.customer, {}).get("customer_group"),
+ customer_map.get(inv.customer, {}).get("territory"),
inv.debit_to, inv.project_name, inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)]
# map income values
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 761d038..11af273 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -4,12 +4,12 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from frappe.utils import cint, flt, getdate, formatdate
+from frappe.utils import cint, flt, getdate, formatdate, cstr
from erpnext.accounts.report.financial_statements import filter_accounts, get_gl_entries
value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit")
-def execute(filters):
+def execute(filters=None):
validate_filters(filters)
data = get_data(filters)
columns = get_columns()
@@ -45,8 +45,8 @@
filters.to_date = filters.year_end_date
def get_data(filters):
- accounts = frappe.db.sql("""select * from `tabAccount` where company=%s order by lft""",
- filters.company, as_dict=True)
+ accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt
+ from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)
if not accounts:
return None
@@ -56,17 +56,58 @@
min_lft, max_rgt = frappe.db.sql("""select min(lft), max(rgt) from `tabAccount`
where company=%s""", (filters.company,))[0]
- gl_entries_by_account = get_gl_entries(filters.company, None, filters.to_date, min_lft, max_rgt,
+ gl_entries_by_account = get_gl_entries(filters.company, filters.from_date, filters.to_date, min_lft, max_rgt,
ignore_closing_entries=not flt(filters.with_period_closing_entry))
- total_row = calculate_values(accounts, gl_entries_by_account, filters)
+ opening_balances = get_opening_balances(filters)
+
+ total_row = calculate_values(accounts, gl_entries_by_account, opening_balances, filters)
accumulate_values_into_parents(accounts, accounts_by_name)
data = prepare_data(accounts, filters, total_row)
return data
+
+def get_opening_balances(filters):
+ balance_sheet_opening = get_rootwise_opening_balances(filters, "Balance Sheet")
+ pl_opening = get_rootwise_opening_balances(filters, "Profit and Loss")
+
+ balance_sheet_opening.update(pl_opening)
+ return balance_sheet_opening
+
+
+def get_rootwise_opening_balances(filters, report_type):
+ additional_conditions = " and posting_date >= %(year_start_date)s" \
+ if report_type == "Profit and Loss" else ""
+
+ if not flt(filters.with_period_closing_entry):
+ additional_conditions += " and ifnull(voucher_type, '')!='Period Closing Voucher'"
+
+ gle = frappe.db.sql("""
+ select
+ account, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit
+ from `tabGL Entry`
+ where
+ company=%(company)s
+ {additional_conditions}
+ and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
+ and account in (select name from `tabAccount` where report_type=%(report_type)s)
+ group by account""".format(additional_conditions=additional_conditions),
+ {
+ "company": filters.company,
+ "from_date": filters.from_date,
+ "report_type": report_type,
+ "year_start_date": filters.year_start_date
+ },
+ as_dict=True)
+
+ opening = frappe._dict()
+ for d in gle:
+ opening.setdefault(d.account, d)
+
+ return opening
-def calculate_values(accounts, gl_entries_by_account, filters):
+def calculate_values(accounts, gl_entries_by_account, opening_balances, filters):
init = {
"opening_debit": 0.0,
"opening_credit": 0.0,
@@ -87,30 +128,18 @@
for d in accounts:
d.update(init.copy())
+ # add opening
+ d["opening_debit"] = opening_balances.get(d.name, {}).get("opening_debit", 0)
+ d["opening_credit"] = opening_balances.get(d.name, {}).get("opening_credit", 0)
+
for entry in gl_entries_by_account.get(d.name, []):
- posting_date = getdate(entry.posting_date)
-
- # opening
- if posting_date < filters.from_date:
- is_valid_opening = (d.root_type in ("Asset", "Liability", "Equity") or
- (filters.year_start_date <= posting_date < filters.from_date))
-
- if is_valid_opening:
- d["opening_debit"] += flt(entry.debit)
- d["opening_credit"] += flt(entry.credit)
-
- elif posting_date <= filters.to_date:
-
- if entry.is_opening == "Yes" and d.root_type in ("Asset", "Liability", "Equity"):
- d["opening_debit"] += flt(entry.debit)
- d["opening_credit"] += flt(entry.credit)
-
- else:
- d["debit"] += flt(entry.debit)
- d["credit"] += flt(entry.credit)
+ if cstr(entry.is_opening) != "Yes":
+ d["debit"] += flt(entry.debit)
+ d["credit"] += flt(entry.credit)
total_row["debit"] += d["debit"]
total_row["credit"] += d["credit"]
+
return total_row
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index b5056d7..298ff8e 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -91,7 +91,7 @@
# different filter for group and ledger - improved performance
if acc.is_group:
cond.append("""exists (
- select * from `tabAccount` ac where ac.name = gle.account
+ select name from `tabAccount` ac where ac.name = gle.account
and ac.lft >= %s and ac.rgt <= %s
)""" % (acc.lft, acc.rgt))
else:
@@ -397,7 +397,7 @@
for d in outstanding_voucher_list:
payment_amount = frappe.db.sql("""
- select ifnull(sum(ifnull({amount_query}, 0)), 0)
+ select ifnull(sum({amount_query}), 0)
from
`tabGL Entry`
where
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 6e27401..1b7d20a 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -70,10 +70,6 @@
erpnext.utils.get_address_display(this.frm);
},
- contact_person: function() {
- erpnext.utils.get_contact_details(this.frm);
- },
-
buying_price_list: function() {
this.apply_price_list();
},
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index c4c28e4..20edbca 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -249,7 +249,7 @@
cur_frm.cscript.schedule_date = function(doc, cdt, cdn) {
- cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "schedule_date");
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "schedule_date");
}
frappe.provide("erpnext.buying");
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index b8154ea..3076632 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1,951 +1,960 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-21 16:16:39",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-21 16:16:39",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "supplier_section",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-user",
+ "fieldname": "supplier_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "PO-",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "PO-",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "description": "Supplier (vendor) name as entered in supplier master",
- "fieldname": "supplier",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Supplier",
- "oldfieldname": "supplier",
- "oldfieldtype": "Link",
- "options": "Supplier",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "description": "",
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Supplier",
+ "oldfieldname": "supplier",
+ "oldfieldtype": "Link",
+ "options": "Supplier",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "default": "No",
- "fieldname": "is_subcontracted",
- "fieldtype": "Select",
- "label": "Supply Raw Materials",
- "options": "No\nYes",
- "permlevel": 0,
+ "default": "No",
+ "fieldname": "is_subcontracted",
+ "fieldtype": "Select",
+ "label": "Supply Raw Materials",
+ "options": "No\nYes",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_list_view": 0,
- "label": "Name",
- "permlevel": 0,
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Supplier Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Address",
- "permlevel": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Address",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "50%",
"width": "50%"
- },
+ },
{
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "oldfieldname": "transaction_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "oldfieldname": "transaction_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "options": "Purchase Order",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "options": "Purchase Order",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "description": "",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "description": "",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "no_copy": 0,
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
"permlevel": 0
- },
+ },
{
- "fieldname": "cb_currency",
- "fieldtype": "Column Break",
+ "fieldname": "cb_currency",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "no_copy": 0,
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "no_copy": 0,
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "description": "Rate at which supplier's currency is converted to company's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "hidden": 0,
- "label": "Exchange Rate",
- "no_copy": 0,
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
+ "description": "Rate at which supplier's currency is converted to company's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "label": "Exchange Rate",
+ "no_copy": 0,
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "cb_price_list",
- "fieldtype": "Column Break",
+ "fieldname": "cb_price_list",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "buying_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "options": "Price List",
- "permlevel": 0,
+ "fieldname": "buying_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "permlevel": 0,
- "precision": "9",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "permlevel": 0,
+ "precision": "9",
"print_hide": 1
- },
+ },
{
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
"print_hide": 1
- },
+ },
{
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "no_copy": 0,
- "oldfieldname": "po_details",
- "oldfieldtype": "Table",
- "options": "Purchase Order Item",
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "no_copy": 0,
+ "oldfieldname": "po_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Order Item",
"permlevel": 0
- },
+ },
{
- "fieldname": "get_last_purchase_rate",
- "fieldtype": "Button",
- "label": "Get Last Purchase Rate",
- "oldfieldtype": "Button",
- "permlevel": 0,
+ "fieldname": "get_last_purchase_rate",
+ "fieldtype": "Button",
+ "label": "Get Last Purchase Rate",
+ "oldfieldtype": "Button",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "fieldname": "sb_last_purchase",
- "fieldtype": "Section Break",
+ "fieldname": "sb_last_purchase",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "no_copy": 1,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"reqd": 0
- },
+ },
{
- "fieldname": "column_break_26",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "no_copy": 0,
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "no_copy": 0,
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "description": "If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.",
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "no_copy": 0,
- "oldfieldname": "purchase_other_charges",
- "oldfieldtype": "Link",
- "options": "Purchase Taxes and Charges Template",
- "permlevel": 0,
+ "description": "If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.",
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "no_copy": 0,
+ "oldfieldname": "purchase_other_charges",
+ "oldfieldtype": "Link",
+ "options": "Purchase Taxes and Charges Template",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Purchase Taxes and Charges",
- "no_copy": 0,
- "oldfieldname": "purchase_tax_details",
- "oldfieldtype": "Table",
- "options": "Purchase Taxes and Charges",
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Purchase Taxes and Charges",
+ "no_copy": 0,
+ "oldfieldname": "purchase_tax_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Taxes and Charges",
"permlevel": 0
- },
+ },
{
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "no_copy": 1,
- "oldfieldtype": "HTML",
- "permlevel": 0,
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "no_copy": 1,
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_taxes_and_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "other_charges_added",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_taxes_and_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_added",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_taxes_and_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "other_charges_deducted",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_taxes_and_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_deducted",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "no_copy": 1,
- "oldfieldname": "total_tax",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "total_tax",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break_39",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_39",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "taxes_and_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added",
- "no_copy": 0,
- "oldfieldname": "other_charges_added_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "taxes_and_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_added_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "taxes_and_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
- "no_copy": 0,
- "oldfieldname": "other_charges_deducted_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "taxes_and_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_deducted_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "discount_section",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "discount_section",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Discount On",
- "options": "\nGrand Total\nNet Total",
- "permlevel": 0,
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "column_break_45",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_45",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
"print_hide": 1
- },
+ },
{
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "totals_section",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "totals_section",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "no_copy": 1,
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "description": "In Words will be visible once you save the Purchase Order.",
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "In Words will be visible once you save the Purchase Order.",
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "advance_paid",
- "fieldtype": "Currency",
- "label": "Advance Paid",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "advance_paid",
+ "fieldtype": "Currency",
+ "label": "Advance Paid",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "no_copy": 0,
- "oldfieldname": "grand_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "no_copy": 0,
+ "oldfieldname": "grand_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "oldfieldname": "in_words_import",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "oldfieldname": "in_words_import",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "fold",
- "fieldtype": "Fold",
+ "fieldname": "fold",
+ "fieldtype": "Fold",
"permlevel": 0
- },
+ },
{
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-legal",
"permlevel": 0
- },
+ },
{
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions",
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor",
"permlevel": 0
- },
+ },
{
- "depends_on": "supplier",
- "fieldname": "contact_section",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-bullhorn",
+ "depends_on": "supplier",
+ "fieldname": "contact_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-bullhorn",
"permlevel": 0
- },
+ },
{
- "fieldname": "supplier_address",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Supplier Address",
- "options": "Address",
- "permlevel": 0,
+ "fieldname": "supplier_address",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Supplier Address",
+ "options": "Address",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "cb_contact",
- "fieldtype": "Column Break",
+ "fieldname": "cb_contact",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Contact Person",
- "options": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Contact Person",
+ "options": "Contact",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nStopped\nCancelled",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nStopped\nCancelled",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "no_copy": 0,
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "no_copy": 0,
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "ref_sq",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Ref SQ",
- "no_copy": 1,
- "oldfieldname": "ref_sq",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "ref_sq",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Ref SQ",
+ "no_copy": 1,
+ "oldfieldname": "ref_sq",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "50%",
+ "fieldname": "column_break5",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "50%",
"width": "50%"
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 1
- },
+ },
{
- "fieldname": "sub_contracting",
- "fieldtype": "Section Break",
- "label": "",
- "permlevel": 0,
+ "fieldname": "sub_contracting",
+ "fieldtype": "Section Break",
+ "label": "",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "% of materials received against this Purchase Order",
- "fieldname": "per_received",
- "fieldtype": "Percent",
- "in_list_view": 1,
- "label": "% Received",
- "no_copy": 1,
- "oldfieldname": "per_received",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "description": "% of materials received against this Purchase Order",
+ "fieldname": "per_received",
+ "fieldtype": "Percent",
+ "in_list_view": 1,
+ "label": "% Received",
+ "no_copy": 1,
+ "oldfieldname": "per_received",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break_74",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_74",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "% of materials billed against this Purchase Order.",
- "fieldname": "per_billed",
- "fieldtype": "Percent",
- "in_list_view": 1,
- "label": "% Billed",
- "no_copy": 1,
- "oldfieldname": "per_billed",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "description": "% of materials billed against this Purchase Order.",
+ "fieldname": "per_billed",
+ "fieldtype": "Percent",
+ "in_list_view": 1,
+ "label": "% Billed",
+ "no_copy": 1,
+ "oldfieldname": "per_billed",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "description": "Required raw materials issued to the supplier for producing a sub - contracted item.",
- "fieldname": "raw_material_details",
- "fieldtype": "Section Break",
- "label": "Raw Materials Supplied",
- "oldfieldtype": "Section Break",
- "options": "icon-truck",
- "permlevel": 0,
+ "description": "Required raw materials issued to the supplier for producing a sub - contracted item.",
+ "fieldname": "raw_material_details",
+ "fieldtype": "Section Break",
+ "label": "Raw Materials Supplied",
+ "oldfieldtype": "Section Break",
+ "options": "icon-truck",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "supplied_items",
- "fieldtype": "Table",
- "label": "Supplied Items",
- "no_copy": 0,
- "oldfieldname": "po_raw_material_details",
- "oldfieldtype": "Table",
- "options": "Purchase Order Item Supplied",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "supplied_items",
+ "fieldtype": "Table",
+ "label": "Supplied Items",
+ "no_copy": 0,
+ "oldfieldname": "po_raw_material_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Order Item Supplied",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "recurring_order",
- "fieldtype": "Section Break",
- "label": "Recurring",
- "options": "icon-time",
+ "fieldname": "recurring_order",
+ "fieldtype": "Section Break",
+ "label": "Recurring",
+ "options": "icon-time",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break",
- "fieldtype": "Column Break",
- "label": "Column Break",
+ "fieldname": "column_break",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.docstatus<2",
- "description": "Check if recurring order, uncheck to stop recurring or put proper End Date",
- "fieldname": "is_recurring",
- "fieldtype": "Check",
- "label": "Is Recurring",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.docstatus<2",
+ "description": "Check if recurring order, uncheck to stop recurring or put proper End Date",
+ "fieldname": "is_recurring",
+ "fieldtype": "Check",
+ "label": "Is Recurring",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Start date of current order's period",
- "fieldname": "from_date",
- "fieldtype": "Date",
- "label": "From Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Start date of current order's period",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "End date of current order's period",
- "fieldname": "to_date",
- "fieldtype": "Date",
- "label": "To Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "End date of current order's period",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc",
- "fieldname": "repeat_on_day_of_month",
- "fieldtype": "Int",
- "label": "Repeat on Day of Month",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc",
+ "fieldname": "repeat_on_day_of_month",
+ "fieldtype": "Int",
+ "label": "Repeat on Day of Month",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which recurring order will be stop",
- "fieldname": "end_date",
- "fieldtype": "Date",
- "label": "End Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which recurring order will be stop",
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "label": "End Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break83",
- "fieldtype": "Column Break",
- "label": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break83",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which next invoice will be generated. It is generated on submit.",
- "fieldname": "next_date",
- "fieldtype": "Date",
- "label": "Next Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which next invoice will be generated. It is generated on submit.",
+ "fieldname": "next_date",
+ "fieldtype": "Date",
+ "label": "Next Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "fieldname": "recurring_id",
- "fieldtype": "Data",
- "label": "Recurring Id",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_id",
+ "fieldtype": "Data",
+ "label": "Recurring Id",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Enter email id separated by commas, order will be mailed automatically on particular date",
- "fieldname": "notification_email_address",
- "fieldtype": "Small Text",
- "label": "Notification Email Address",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Enter email id separated by commas, order will be mailed automatically on particular date",
+ "fieldname": "notification_email_address",
+ "fieldtype": "Small Text",
+ "label": "Notification Email Address",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
+ },
+ {
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_print_format",
+ "fieldtype": "Link",
+ "label": "Recurring Print Format",
+ "options": "Print Format",
+ "permlevel": 0,
+ "precision": ""
}
- ],
- "icon": "icon-file-text",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2015-04-28 15:27:28.755819",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Purchase Order",
- "owner": "Administrator",
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
+ "is_submittable": 1,
+ "modified": "2015-07-13 05:28:29.397705",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Purchase Order",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 1,
- "role": "Material User",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "cancel": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Supplier"
- },
+ },
{
- "permlevel": 1,
- "read": 1,
- "role": "Purchase Manager",
+ "permlevel": 1,
+ "read": 1,
+ "role": "Purchase Manager",
"write": 1
}
- ],
- "read_only_onload": 1,
- "search_fields": "status, transaction_date, supplier,grand_total",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only_onload": 1,
+ "search_fields": "status, transaction_date, supplier,grand_total",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "supplier_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
index 08bf0fe..ee0c9bf 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -12,7 +12,6 @@
return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Stopped"];
}
},
- order_by: "per_received asc, modified desc",
onload: function(listview) {
var method = "erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders";
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index f68f814..66d50ba 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -80,6 +80,8 @@
po.company = args.company or "_Test Company"
po.supplier = args.customer or "_Test Supplier"
po.is_subcontracted = args.is_subcontracted or "No"
+ po.currency = args.currency or frappe.db.get_value("Company", po.company, "default_currency")
+ po.conversion_factor = args.conversion_factor or 1
po.append("items", {
"item_code": args.item or args.item_code or "_Test Item",
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 841159c..9f80ba3 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -75,7 +75,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -192,10 +192,11 @@
"read_only": 0
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount %",
+ "label": "Discount on Price List Rate (%)",
"permlevel": 0,
"print_hide": 0,
"read_only": 0
@@ -537,7 +538,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:54:16.899713",
+ "modified": "2015-06-02 14:19:21.459032",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js
index 3188c3c..1f7134d 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.js
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.js
@@ -57,3 +57,7 @@
return { filters: filter }
}
+
+cur_frm.add_fetch('item_code', 'item_name', 'item_name');
+cur_frm.add_fetch('item_code', 'description', 'description');
+
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
index e1b57e4..875ce0d 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
@@ -128,6 +128,14 @@
"width": "50%"
},
{
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "label": "Item Name",
+ "permlevel": 0,
+ "precision": "",
+ "read_only": 1
+ },
+ {
"fieldname": "description",
"fieldtype": "Small Text",
"in_filter": 1,
@@ -219,7 +227,7 @@
"icon": "icon-search",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-04-14 07:37:07.331291",
+ "modified": "2015-06-08 02:40:25.121948",
"modified_by": "Administrator",
"module": "Buying",
"name": "Quality Inspection",
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.py b/erpnext/buying/doctype/quality_inspection/quality_inspection.py
index ec32b6c..d1d9518 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.py
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.py
@@ -31,7 +31,6 @@
(self.name, self.modified, self.purchase_receipt_no,
self.item_code))
-
def on_cancel(self):
if self.purchase_receipt_no:
frappe.db.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2
@@ -39,7 +38,6 @@
where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""",
(self.modified, self.purchase_receipt_no, self.item_code))
-
def item_query(doctype, txt, searchfield, start, page_len, filters):
if filters.get("from"):
from frappe.desk.reportview import get_match_cond
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 27ca393..a1a38d5 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -1,247 +1,247 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "naming_series:",
- "creation": "2013-01-10 16:34:11",
- "description": "Supplier of Goods or Services.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-01-10 16:34:11",
+ "description": "Supplier of Goods or Services.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "basic_info",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-user",
+ "fieldname": "basic_info",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "SUPP-",
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "SUPP-",
"permlevel": 0
- },
+ },
{
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "in_list_view": 0,
- "label": "Supplier Name",
- "no_copy": 1,
- "oldfieldname": "supplier_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "in_list_view": 0,
+ "label": "Supplier Name",
+ "no_copy": 1,
+ "oldfieldname": "supplier_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "supplier_type",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Supplier Type",
- "oldfieldname": "supplier_type",
- "oldfieldtype": "Link",
- "options": "Supplier Type",
- "permlevel": 0,
+ "fieldname": "supplier_type",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Supplier Type",
+ "oldfieldname": "supplier_type",
+ "oldfieldtype": "Link",
+ "options": "Supplier Type",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "address_contacts",
- "fieldtype": "Section Break",
- "label": "Address & Contacts",
- "oldfieldtype": "Column Break",
- "options": "icon-map-marker",
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "address_contacts",
+ "fieldtype": "Section Break",
+ "label": "Address & Contacts",
+ "oldfieldtype": "Column Break",
+ "options": "icon-map-marker",
"permlevel": 0
- },
+ },
{
- "fieldname": "address_html",
- "fieldtype": "HTML",
- "label": "Address HTML",
- "permlevel": 0,
+ "fieldname": "address_html",
+ "fieldtype": "HTML",
+ "label": "Address HTML",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "contact_html",
- "fieldtype": "HTML",
- "label": "Contact HTML",
- "permlevel": 0,
+ "fieldname": "contact_html",
+ "fieldtype": "HTML",
+ "label": "Contact HTML",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "default_payable_accounts",
- "fieldtype": "Section Break",
- "label": "Default Payable Accounts",
+ "fieldname": "default_payable_accounts",
+ "fieldtype": "Section Break",
+ "label": "Default Payable Accounts",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "Mention if non-standard receivable account applicable",
- "fieldname": "accounts",
- "fieldtype": "Table",
- "label": "Accounts",
- "options": "Party Account",
+ "depends_on": "eval:!doc.__islocal",
+ "description": "Mention if non-standard receivable account applicable",
+ "fieldname": "accounts",
+ "fieldtype": "Table",
+ "label": "Accounts",
+ "options": "Party Account",
"permlevel": 0
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_currency",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Currency",
- "no_copy": 1,
- "options": "Currency",
+ "fieldname": "default_currency",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Currency",
+ "no_copy": 1,
+ "options": "Currency",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_price_list",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Price List",
- "options": "Price List",
+ "fieldname": "default_price_list",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Price List",
+ "options": "Price List",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_taxes_and_charges",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Taxes and Charges",
- "options": "Purchase Taxes and Charges Template",
+ "fieldname": "default_taxes_and_charges",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Taxes and Charges",
+ "options": "Purchase Taxes and Charges Template",
"permlevel": 0
- },
+ },
{
- "fieldname": "credit_days",
- "fieldtype": "Int",
- "label": "Credit Days",
+ "fieldname": "credit_days",
+ "fieldtype": "Int",
+ "label": "Credit Days",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "website",
- "fieldtype": "Data",
- "label": "Website",
- "oldfieldname": "website",
- "oldfieldtype": "Data",
+ "fieldname": "website",
+ "fieldtype": "Data",
+ "label": "Website",
+ "oldfieldname": "website",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "description": "Statutory info and other general information about your Supplier",
- "fieldname": "supplier_details",
- "fieldtype": "Text",
- "label": "Supplier Details",
- "oldfieldname": "supplier_details",
- "oldfieldtype": "Code",
+ "description": "Statutory info and other general information about your Supplier",
+ "fieldname": "supplier_details",
+ "fieldtype": "Text",
+ "label": "Supplier Details",
+ "oldfieldname": "supplier_details",
+ "oldfieldtype": "Code",
"permlevel": 0
- },
+ },
{
- "fieldname": "communications",
- "fieldtype": "Table",
- "hidden": 1,
- "label": "Communications",
- "options": "Communication",
- "permlevel": 0,
+ "fieldname": "communications",
+ "fieldtype": "Table",
+ "hidden": 1,
+ "label": "Communications",
+ "options": "Communication",
+ "permlevel": 0,
"print_hide": 1
}
- ],
- "icon": "icon-user",
- "idx": 1,
- "modified": "2015-02-24 17:35:03.821319",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Supplier",
- "owner": "Administrator",
+ ],
+ "icon": "icon-user",
+ "idx": 1,
+ "modified": "2015-07-13 05:28:29.121285",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier",
+ "owner": "Administrator",
"permissions": [
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Purchase User"
- },
+ },
{
- "amend": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Manager",
- "submit": 0,
+ "amend": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Manager",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Master Manager",
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Master Manager",
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "permlevel": 0,
- "read": 1,
- "role": "Material User"
- },
+ "apply_user_permissions": 1,
+ "permlevel": 0,
+ "read": 1,
+ "role": "Stock User"
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material Manager"
- },
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager"
+ },
{
- "apply_user_permissions": 1,
- "permlevel": 0,
- "read": 1,
+ "apply_user_permissions": 1,
+ "permlevel": 0,
+ "read": 1,
"role": "Accounts User"
- },
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Accounts Manager"
}
- ],
- "search_fields": "supplier_name, supplier_type",
+ ],
+ "search_fields": "supplier_name, supplier_type",
"title_field": "supplier_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 91631e8..02d24c7 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1,757 +1,757 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-21 16:16:45",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-21 16:16:45",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "supplier_section",
- "fieldtype": "Section Break",
- "label": "Supplier",
- "options": "icon-user",
+ "fieldname": "supplier_section",
+ "fieldtype": "Section Break",
+ "label": "Supplier",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "SQTN-",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "SQTN-",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "description": "Supplier (vendor) name as entered in supplier master",
- "fieldname": "supplier",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Supplier",
- "oldfieldname": "supplier",
- "oldfieldtype": "Link",
- "options": "Supplier",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "description": "",
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Supplier",
+ "oldfieldname": "supplier",
+ "oldfieldtype": "Link",
+ "options": "Supplier",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_list_view": 0,
- "label": "Name",
- "permlevel": 0,
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Address",
- "permlevel": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Address",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "50%",
"width": "50%"
- },
+ },
{
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "oldfieldname": "transaction_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "oldfieldname": "transaction_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 1,
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "options": "Supplier Quotation",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "options": "Supplier Quotation",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "description": "",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "description": "",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "no_copy": 0,
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
"permlevel": 0
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "no_copy": 0,
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "no_copy": 0,
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "description": "Rate at which supplier's currency is converted to company's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "hidden": 0,
- "label": "Exchange Rate",
- "no_copy": 0,
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
+ "description": "Rate at which supplier's currency is converted to company's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "label": "Exchange Rate",
+ "no_copy": 0,
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "cb_price_list",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_width": "50%",
+ "fieldname": "cb_price_list",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_width": "50%",
"width": "50%"
- },
+ },
{
- "fieldname": "buying_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "options": "Price List",
- "permlevel": 0,
+ "fieldname": "buying_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "depends_on": "buying_price_list",
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "buying_price_list",
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "depends_on": "buying_price_list",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "permlevel": 0,
- "precision": "9",
+ "depends_on": "buying_price_list",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "permlevel": 0,
+ "precision": "9",
"print_hide": 1
- },
+ },
{
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
"print_hide": 1
- },
+ },
{
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "no_copy": 0,
- "oldfieldname": "po_details",
- "oldfieldtype": "Table",
- "options": "Supplier Quotation Item",
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "no_copy": 0,
+ "oldfieldname": "po_details",
+ "oldfieldtype": "Table",
+ "options": "Supplier Quotation Item",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break_22",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_22",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "no_copy": 1,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"reqd": 0
- },
+ },
{
- "fieldname": "column_break_24",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_24",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "no_copy": 0,
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "no_copy": 0,
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "Taxes and Charges",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "Taxes and Charges",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
"permlevel": 0
- },
+ },
{
- "description": "If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.",
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "no_copy": 1,
- "oldfieldname": "purchase_other_charges",
- "oldfieldtype": "Link",
- "options": "Purchase Taxes and Charges Template",
- "permlevel": 0,
+ "description": "If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.",
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "no_copy": 1,
+ "oldfieldname": "purchase_other_charges",
+ "oldfieldtype": "Link",
+ "options": "Purchase Taxes and Charges Template",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Purchase Taxes and Charges",
- "no_copy": 0,
- "oldfieldname": "purchase_tax_details",
- "oldfieldtype": "Table",
- "options": "Purchase Taxes and Charges",
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Purchase Taxes and Charges",
+ "no_copy": 0,
+ "oldfieldname": "purchase_tax_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Taxes and Charges",
"permlevel": 0
- },
+ },
{
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "no_copy": 1,
- "oldfieldtype": "HTML",
- "permlevel": 0,
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "no_copy": 1,
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_taxes_and_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "other_charges_added",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_taxes_and_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_added",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_taxes_and_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "other_charges_deducted",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_taxes_and_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_deducted",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "no_copy": 1,
- "oldfieldname": "total_tax",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "total_tax",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break_37",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_37",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "taxes_and_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added",
- "no_copy": 0,
- "oldfieldname": "other_charges_added_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "taxes_and_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_added_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "taxes_and_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
- "no_copy": 0,
- "oldfieldname": "other_charges_deducted_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "taxes_and_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted",
+ "no_copy": 0,
+ "oldfieldname": "other_charges_deducted_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "section_break_41",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_41",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Discount On",
- "options": "\nGrand Total\nNet Total",
- "permlevel": 0,
- "precision": "",
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "permlevel": 0,
+ "precision": "",
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_43",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_43",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
"print_hide": 1
- },
+ },
{
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "section_break_46",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_46",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "no_copy": 1,
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "description": "In Words will be visible once you save the Purchase Order.",
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "In Words will be visible once you save the Purchase Order.",
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "no_copy": 0,
- "oldfieldname": "grand_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "no_copy": 0,
+ "oldfieldname": "grand_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "oldfieldname": "in_words_import",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "oldfieldname": "in_words_import",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "fold",
- "fieldtype": "Fold",
+ "fieldname": "fold",
+ "fieldtype": "Fold",
"permlevel": 0
- },
+ },
{
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "oldfieldtype": "Section Break",
+ "options": "icon-legal",
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "get_terms",
- "fieldtype": "Button",
- "label": "Get Terms and Conditions",
- "oldfieldtype": "Button",
+ "fieldname": "get_terms",
+ "fieldtype": "Button",
+ "label": "Get Terms and Conditions",
+ "oldfieldtype": "Button",
"permlevel": 0
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions",
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor",
"permlevel": 0
- },
+ },
{
- "depends_on": "supplier",
- "fieldname": "contact_section",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "options": "icon-bullhorn",
+ "depends_on": "supplier",
+ "fieldname": "contact_section",
+ "fieldtype": "Section Break",
+ "label": "Contact Info",
+ "options": "icon-bullhorn",
"permlevel": 0
- },
+ },
{
- "fieldname": "supplier_address",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Supplier Address",
- "options": "Address",
- "permlevel": 0,
+ "fieldname": "supplier_address",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Supplier Address",
+ "options": "Address",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Contact Person",
- "options": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Contact Person",
+ "options": "Contact",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
"permlevel": 0
- },
+ },
{
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nStopped\nCancelled",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nStopped\nCancelled",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "default": "No",
- "fieldname": "is_subcontracted",
- "fieldtype": "Select",
- "label": "Is Subcontracted",
- "options": "\nYes\nNo",
- "permlevel": 0,
+ "default": "No",
+ "fieldname": "is_subcontracted",
+ "fieldtype": "Select",
+ "label": "Is Subcontracted",
+ "options": "\nYes\nNo",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_57",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_57",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "no_copy": 0,
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "no_copy": 0,
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 1
}
- ],
- "icon": "icon-shopping-cart",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2015-03-23 14:47:07.225609",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Supplier Quotation",
- "owner": "Administrator",
+ ],
+ "icon": "icon-shopping-cart",
+ "idx": 1,
+ "is_submittable": 1,
+ "modified": "2015-07-13 05:28:30.252636",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier Quotation",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Manufacturing Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Manufacturing Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User",
- "share": 1,
- "submit": 0,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User",
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material User",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Supplier",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Supplier",
+ "submit": 0,
"write": 0
- },
+ },
{
- "permlevel": 1,
- "read": 1,
- "role": "Purchase Manager",
+ "permlevel": 1,
+ "read": 1,
+ "role": "Purchase Manager",
"write": 1
}
- ],
- "read_only_onload": 1,
- "search_fields": "status, transaction_date, supplier,grand_total",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only_onload": 1,
+ "search_fields": "status, transaction_date, supplier,grand_total",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "supplier_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index 014c543..c591b96 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -59,7 +59,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -121,10 +121,11 @@
"read_only": 0
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount %",
+ "label": "Discount on Price List Rate (%)",
"permlevel": 0,
"print_hide": 0,
"read_only": 0
@@ -412,7 +413,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:54:36.253819",
+ "modified": "2015-06-02 14:19:33.922968",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation Item",
diff --git a/erpnext/change_log/current/learn.md b/erpnext/change_log/current/learn.md
new file mode 100644
index 0000000..f91c0a4
--- /dev/null
+++ b/erpnext/change_log/current/learn.md
@@ -0,0 +1 @@
+- New help videos for Selling, Buying, Human Resource, Manufacturing and Buying
diff --git a/erpnext/change_log/current/paranthesis_in_images.md b/erpnext/change_log/current/paranthesis_in_images.md
new file mode 100644
index 0000000..4859e96
--- /dev/null
+++ b/erpnext/change_log/current/paranthesis_in_images.md
@@ -0,0 +1 @@
+- Display images in website's Item and Item List pages when the filename has paranthesis in its name
diff --git a/erpnext/change_log/current/readme.md b/erpnext/change_log/current/readme.md
new file mode 100644
index 0000000..e93bb75
--- /dev/null
+++ b/erpnext/change_log/current/readme.md
@@ -0,0 +1,3 @@
+Leave change log files in this folder for user release notes.
+
+(this file is just a place holder, don't delete it)
diff --git a/erpnext/change_log/current/rename.md b/erpnext/change_log/current/rename.md
new file mode 100644
index 0000000..54efb50
--- /dev/null
+++ b/erpnext/change_log/current/rename.md
@@ -0,0 +1,3 @@
+- Role rename: **Material User** is now **Stock User**
+- Role rename: **Material Manager** is now **Stock Manager**
+- Role rename: **Material Master Manager** is now **Item Manager**
diff --git a/erpnext/change_log/current/shopping_cart.md b/erpnext/change_log/current/shopping_cart.md
new file mode 100644
index 0000000..77a5e5d
--- /dev/null
+++ b/erpnext/change_log/current/shopping_cart.md
@@ -0,0 +1,3 @@
+- Fixed inconsistent visibility of 'Add to Cart' button
+- Use Customer's Price List in Shopping Cart if found
+- Fixed Address creation from Shopping Cart
diff --git a/erpnext/change_log/v5/v5_0_11.md b/erpnext/change_log/v5/v5_0_11.md
new file mode 100644
index 0000000..d5be6ea
--- /dev/null
+++ b/erpnext/change_log/v5/v5_0_11.md
@@ -0,0 +1,8 @@
+- Watch help videos in new module "Learn"
+- Letter head and Terms removed from Purchase Invoice
+- Renaming Discount fields to "Discount on Price List Rate"
+- Backup manager: You you can choose which backup to download
+- "Reserved Warehouse" is renamed "Delivery Warehouse" in Sales Order
+- Timezone fixes: See all time-stamps in Events etc in your timezone, if you are not in the system timezone.
+- POS Setting is renamed to POS Profile
+- Fixes to POS
diff --git a/erpnext/change_log/v5/v5_0_12.md b/erpnext/change_log/v5/v5_0_12.md
new file mode 100644
index 0000000..ae02d71
--- /dev/null
+++ b/erpnext/change_log/v5/v5_0_12.md
@@ -0,0 +1,2 @@
+- Introduced `Round Off` account to book rounding loss automatically
+- Added 2 new fields 'Round Off Account' and 'Round Off Cost Center' in Company
diff --git a/erpnext/change_log/v5/v5_0_25.md b/erpnext/change_log/v5/v5_0_25.md
new file mode 100644
index 0000000..e8b8634
--- /dev/null
+++ b/erpnext/change_log/v5/v5_0_25.md
@@ -0,0 +1,17 @@
+- Performance upgrade in Trial Balance, General Ledger, AR/AP, Balance Sheet and P&L Statement reports
+- Add index on Account and GL Entry, Sales Invoice and Purchase Invoice table
+- Don't create Time Logs against Production Order if Workstation is not specified in Operations
+- Task should be mandatory in Time Log only when Project is mentioned but Production Order is not
+- Supplier invoice no unique validation and supplier invoice date can not be after posting date
+- Removed BOM No from mandatory from Stock Entry against Production Order
+- Load tasks in project for printing purpose
+- Added Customers Not Buying Since Long Time against Sales Invoice
+- POS - search by Item Group
+- Payment period based on invoice date: show party columns and filter based on party
+- Barcode added to Purchase Receipt
+- Fetch item name and desc on change of item code in Quality Inspection
+- Show item name in item grid view based 'In List View' property
+- Validate and update manufactured qty in Stock Entry
+- Show only users with Expense Approver role in Expense Claim Approver field
+- Over Production Allowance Percentage Setting added to Manufacturing Settings
+- Activity Cost - Mandatory removed for Employee
\ No newline at end of file
diff --git a/erpnext/change_log/v5/v5_0_28.md b/erpnext/change_log/v5/v5_0_28.md
new file mode 100644
index 0000000..6ad54e6
--- /dev/null
+++ b/erpnext/change_log/v5/v5_0_28.md
@@ -0,0 +1 @@
+- Open notification of Sales Order and Purchase Order based on whether Invoice is created against them. For eg. If a Sales Order is not Invoiced, it will be considered as open. Previously it was considered open if Delivery Note was created against Sales Order.
diff --git a/erpnext/change_log/v5/v5_1_0.md b/erpnext/change_log/v5/v5_1_0.md
new file mode 100644
index 0000000..3ed2227
--- /dev/null
+++ b/erpnext/change_log/v5/v5_1_0.md
@@ -0,0 +1,8 @@
+- Item variants is now manageable via dedicated tool **Manage Variants**. To learn about it, check [Manual Page for Item variants](https://manual.erpnext.com/contents/stock/item/item-variants)
+- Against account in General Ledger will show Party instead of Account (which is not useful)
+- Print format for recurring documents can be set by the users
+- Recurring documents won't be created for Stopped Sales / Purchase Orders.
+- Lead status will be changed to 'Opportunity' when Lead converted to Opportunity
+- Amount in Journal Entry list view
+- Currency exchange rate is now automatically fetched from fixer.io, instead of jsonrates.com
+- Item image is now available in Sales / Purchase Invoice
\ No newline at end of file
diff --git a/erpnext/change_log/v5/v5_1_3.md b/erpnext/change_log/v5/v5_1_3.md
new file mode 100644
index 0000000..9825a10
--- /dev/null
+++ b/erpnext/change_log/v5/v5_1_3.md
@@ -0,0 +1,3 @@
+- Hide zero balance rows in batch-wise balance history report
+- Autocomplete issue fixed in Manage Variants
+- Remove user permission (Employee role) if user id is unset from Employee record
\ No newline at end of file
diff --git a/erpnext/change_log/v5/v5_1_4.md b/erpnext/change_log/v5/v5_1_4.md
new file mode 100644
index 0000000..c11af81
--- /dev/null
+++ b/erpnext/change_log/v5/v5_1_4.md
@@ -0,0 +1,4 @@
+- Mode of Payment added to POS Profile
+- Expired Batch is not allowed in stock entry of type manufacturing / repack
+- Validate item rate against reference document with tolerance 0.009
+- Set Customer name in opportunity as per company name in lead
\ No newline at end of file
diff --git a/erpnext/change_log/v5/v5_1_5.md b/erpnext/change_log/v5/v5_1_5.md
new file mode 100644
index 0000000..9ebe28b
--- /dev/null
+++ b/erpnext/change_log/v5/v5_1_5.md
@@ -0,0 +1,8 @@
+- Customer's credit days based on fixed days / last day of the next month **[Sponsored by McLean Images](http://www.mcleans.net.au)**
+- Production Order is not allowed against Item Template (for Variants)
+- Currency symbol fixed for outstanding amount and advance amount field in Sales Invoice
+- A Contact can be linked to Customer, Supplier and Sales partner at the same time
+- Validation added to prevent task being closed with open dependent tasks
+- Blocked stock transactions against an expired batch
+- Added Employees in Newsletter List
+- Link Address to Customer / Supplier / Lead, based on logged-in user, if created in portal
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 6b02c1b..f32aeed 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -75,6 +75,11 @@
"items": [
{
"type": "doctype",
+ "name": "Company",
+ "description": _("Company (not Customer or Supplier) master.")
+ },
+ {
+ "type": "doctype",
"name": "Fiscal Year",
"description": _("Financial / accounting year.")
},
@@ -113,8 +118,8 @@
},
{
"type": "doctype",
- "name": "POS Setting",
- "label": _("Point-of-Sale Setting"),
+ "name": "POS Profile",
+ "label": _("Point-of-Sale Profile"),
"description": _("Rules to calculate shipping amount for a sale")
},
{
@@ -329,4 +334,25 @@
},
]
},
+ {
+ "label": _("Help"),
+ "icon": "icon-facetime-video",
+ "items": [
+ {
+ "type": "help",
+ "label": _("Chart of Accounts"),
+ "youtube_id": "DyR-DST-PyA"
+ },
+ {
+ "type": "help",
+ "label": _("Opening Accounting Balance"),
+ "youtube_id": "kdgM20Q-q68"
+ },
+ {
+ "type": "help",
+ "label": _("Setting up Taxes"),
+ "youtube_id": "nQ1zZdPgdaQ"
+ }
+ ]
+ }
]
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index 17418c3..7729872 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -156,4 +156,14 @@
}
]
},
+ {
+ "label": _("Help"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Customer and Supplier"),
+ "youtube_id": "anoGi_RpQ20"
+ },
+ ]
+ },
]
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index 48b8b2f..3a7ab18 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -128,4 +128,14 @@
},
]
},
+ {
+ "label": _("Help"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Lead to Quotation"),
+ "youtube_id": "TxYX4r4JAKA"
+ },
+ ]
+ },
]
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index a08fb50..b0c7345 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -62,5 +62,12 @@
"icon": "icon-phone",
"icon": "octicon octicon-issue-opened",
"type": "module"
+ },
+ "Learn": {
+ "color": "#7272FF",
+ "force_show": True,
+ "icon": "icon-facetime-video",
+ "type": "module",
+ "is_help": True
}
}
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 2e60061..72fe8dd 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -60,7 +60,7 @@
"items": [
{
"type": "doctype",
- "name": "Salary Manager",
+ "name": "Process Payroll",
"label": _("Process Payroll"),
"description":_("Generate Salary Slips"),
"hide_count": True
diff --git a/erpnext/config/learn.py b/erpnext/config/learn.py
new file mode 100644
index 0000000..0b5f2d5
--- /dev/null
+++ b/erpnext/config/learn.py
@@ -0,0 +1,194 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return [
+ {
+ "label": _("General"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Navigating"),
+ "youtube_id": "YDoI2DF4Lmc"
+ },
+ {
+ "type": "help",
+ "label": _("Setup Wizard"),
+ "youtube_id": "oIOf_zCFWKQ"
+ },
+ {
+ "type": "help",
+ "label": _("Customizing Forms"),
+ "youtube_id": "pJhL9mmxV_U"
+ },
+ ]
+
+ },
+ {
+ "label": _("Setup"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Data Import and Export"),
+ "youtube_id": "6wiriRKPhmg"
+ },
+ {
+ "type": "help",
+ "label": _("Opening Stock Balance"),
+ "youtube_id": "0yPgrtfeCTs"
+ },
+ {
+ "type": "help",
+ "label": _("Setting up Email"),
+ "youtube_id": "YFYe0DrB95o"
+ },
+ {
+ "type": "help",
+ "label": _("Printing and Branding"),
+ "youtube_id": "cKZHcx1znMc"
+ },
+ {
+ "type": "help",
+ "label": _("Users and Permissions"),
+ "youtube_id": "fnBoRhBrwR4"
+ },
+ {
+ "type": "help",
+ "label": _("Workflow"),
+ "youtube_id": "yObJUg9FxFs"
+ },
+ ]
+ },
+ {
+ "label": _("Accounts"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Chart of Accounts"),
+ "youtube_id": "DyR-DST-PyA"
+ },
+ {
+ "type": "help",
+ "label": _("Setting up Taxes"),
+ "youtube_id": "nQ1zZdPgdaQ"
+ },
+ {
+ "type": "help",
+ "label": _("Opening Accounting Balance"),
+ "youtube_id": "kdgM20Q-q68"
+ }
+ ]
+ },
+ {
+ "label": _("CRM"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Lead to Quotation"),
+ "youtube_id": "TxYX4r4JAKA"
+ },
+ ]
+ },
+ {
+ "label": _("Selling"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Customer and Supplier"),
+ "youtube_id": "anoGi_RpQ20"
+ },
+ {
+ "type": "help",
+ "label": _("Sales Order to Payment"),
+ "youtube_id": "7AMq4lqkN4A"
+ },
+ {
+ "type": "help",
+ "label": _("Point-of-Sale"),
+ "youtube_id": "4WkelWkbP_c"
+ }
+ ]
+ },
+ {
+ "label": _("Stock"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Items and Pricing"),
+ "youtube_id": "qXaEwld4_Ps"
+ },
+ {
+ "type": "help",
+ "label": _("Opening Stock Balance"),
+ "youtube_id": "0yPgrtfeCTs"
+ },
+ ]
+ },
+ {
+ "label": _("Buying"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Customer and Supplier"),
+ "youtube_id": "anoGi_RpQ20"
+ },
+ {
+ "type": "help",
+ "label": _("Material Request to Purchase Order"),
+ "youtube_id": "4TN9kPyfIqM"
+ },
+
+ ]
+ },
+ {
+ "label": _("Manufacturing"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Bill of Materials"),
+ "youtube_id": "hDV0c1OeWLo"
+ },
+ {
+ "type": "help",
+ "label": _("Production Planning Tool"),
+ "youtube_id": "CzatSl4zJ2Y"
+ },
+ {
+ "type": "help",
+ "label": _("Production Order"),
+ "youtube_id": "ZotgLyp2YFY"
+ },
+
+ ]
+ },
+ {
+ "label": _("Human Resource"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Setting up Employees"),
+ "youtube_id": "USfIUdZlUhw"
+ },
+ {
+ "type": "help",
+ "label": _("Leave Management"),
+ "youtube_id": "fc0p_AXebc8"
+ },
+ {
+ "type": "help",
+ "label": _("Expense Claims"),
+ "youtube_id": "5SZHJF--ZFY"
+ },
+ ]
+ },
+ {
+ "label": _("Projects"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Managing Projects"),
+ "youtube_id": "egxIGwtoKI4"
+ },
+ ]
+ },
+ ]
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index f982dff..5b51b0f 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -55,6 +55,14 @@
"name": "BOM Replace Tool",
"description": _("Replace Item / BOM in all BOMs"),
},
+ {
+ "type": "page",
+ "name": "bom-browser",
+ "icon": "icon-sitemap",
+ "label": _("BOM Browser"),
+ "description": _("Tree of Bill of Materials"),
+ "doctype": "BOM"
+ }
]
},
{
@@ -95,6 +103,23 @@
"name": "Completed Production Orders",
"doctype": "Production Order"
},
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "BOM Search",
+ "doctype": "BOM"
+ },
]
},
+ {
+ "label": _("Help"),
+ "icon": "icon-facetime-video",
+ "items": [
+ {
+ "type": "help",
+ "label": _("Bill of Materials"),
+ "youtube_id": "hDV0c1OeWLo"
+ },
+ ]
+ }
]
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 91c44d0..5433964 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -144,7 +144,7 @@
},
{
"type": "doctype",
- "name": "Sales BOM",
+ "name": "Product Bundle",
"description": _("Bundle items at time of sale."),
},
{
@@ -240,6 +240,12 @@
{
"type": "report",
"is_query_report": True,
+ "name": "BOM Search",
+ "doctype": "BOM"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
"name": "Customers Not Buying Since Long Time",
"doctype": "Sales Order"
},
@@ -275,4 +281,14 @@
},
]
},
+ {
+ "label": _("Help"),
+ "items": [
+ {
+ "type": "help",
+ "label": _("Customer and Supplier"),
+ "youtube_id": "anoGi_RpQ20"
+ },
+ ]
+ },
]
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index a33fd539..a660942 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -44,6 +44,36 @@
]
},
{
+ "label": _("Help"),
+ "items": [
+ {
+ "type": "help",
+ "name": _("Data Import and Export"),
+ "youtube_id": "6wiriRKPhmg"
+ },
+ {
+ "type": "help",
+ "label": _("Setting up Email"),
+ "youtube_id": "YFYe0DrB95o"
+ },
+ {
+ "type": "help",
+ "label": _("Printing and Branding"),
+ "youtube_id": "cKZHcx1znMc"
+ },
+ {
+ "type": "help",
+ "label": _("Users and Permissions"),
+ "youtube_id": "fnBoRhBrwR4"
+ },
+ {
+ "type": "help",
+ "label": _("Workflow"),
+ "youtube_id": "yObJUg9FxFs"
+ },
+ ]
+ },
+ {
"label": _("Customize"),
"icon": "icon-glass",
"items": [
@@ -80,43 +110,7 @@
"description": _("Setup SMS gateway settings")
},
]
- },
- {
- "label": _("Masters"),
- "icon": "icon-star",
- "items": [
- {
- "type": "doctype",
- "name": "Company",
- "description": _("Company (not Customer or Supplier) master.")
- },
- {
- "type": "doctype",
- "name": "Item",
- "description": _("Item master.")
- },
- {
- "type": "doctype",
- "name": "Customer",
- "description": _("Customer master.")
- },
- {
- "type": "doctype",
- "name": "Supplier",
- "description": _("Supplier master.")
- },
- {
- "type": "doctype",
- "name": "Contact",
- "description": _("Contact master.")
- },
- {
- "type": "doctype",
- "name": "Address",
- "description": _("Address master.")
- },
- ]
- },
+ }
]
for module, label, icon in (
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index d3481b5..f4ec6f0 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -83,6 +83,11 @@
"name": "Stock UOM Replace Utility",
"description": _("Change UOM for an Item."),
},
+ {
+ "type": "doctype",
+ "name": "Manage Variants",
+ "description": _("Manage Item Variants."),
+ },
]
},
{
@@ -254,4 +259,25 @@
},
]
},
+ {
+ "label": _("Help"),
+ "icon": "icon-facetime-video",
+ "items": [
+ {
+ "type": "help",
+ "label": _("Items and Pricing"),
+ "youtube_id": "qXaEwld4_Ps"
+ },
+ {
+ "type": "help",
+ "label": _("Opening Stock Balance"),
+ "youtube_id": "0yPgrtfeCTs"
+ },
+ {
+ "type": "help",
+ "label": _("Item Variants"),
+ "youtube_id": "OGBETlCzU5o"
+ },
+ ]
+ }
]
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index de92f13..98f2409 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -38,7 +38,8 @@
convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
def before_recurring(self):
- self.fiscal_year = None
+ if self.meta.get_field("fiscal_year"):
+ self.fiscal_year = None
if self.meta.get_field("due_date"):
self.due_date = None
@@ -46,7 +47,7 @@
for fieldname in ["posting_date", "transaction_date"]:
if not self.get(fieldname) and self.meta.get_field(fieldname):
self.set(fieldname, today())
- if not self.fiscal_year:
+ if self.meta.get_field("fiscal_year") and not self.fiscal_year:
self.fiscal_year = get_fiscal_year(self.get(fieldname))[0]
break
@@ -334,7 +335,7 @@
@frappe.whitelist()
def get_tax_rate(account_head):
return frappe.db.get_value("Account", account_head, "tax_rate")
-
+
@frappe.whitelist()
def get_default_taxes_and_charges(master_doctype):
default_tax = frappe.db.get_value(master_doctype, {"is_default": 1})
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index d4e69cf..9867973 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -279,7 +279,7 @@
def set_qty_as_per_stock_uom(self):
for d in self.get("items"):
- if d.meta.get_field("stock_qty") and not d.stock_qty:
+ if d.meta.get_field("stock_qty"):
if not d.conversion_factor:
frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx))
d.stock_qty = flt(d.qty) * flt(d.conversion_factor)
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 898dd23..801f6f2 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -194,7 +194,7 @@
and tabBOM.is_active=1
and tabBOM.%(key)s like "%(txt)s"
%(fcond)s %(mcond)s
- limit %(start)s, %(page_len)s """ % {'key': searchfield, 'txt': "%%%s%%" % txt,
+ limit %(start)s, %(page_len)s """ % {'key': searchfield, 'txt': "%%%s%%" % frappe.db.escape(txt),
'fcond': get_filters_cond(doctype, filters, conditions),
'mcond':get_match_cond(doctype), 'start': start, 'page_len': page_len})
@@ -207,7 +207,7 @@
where `tabProject`.status not in ("Completed", "Cancelled")
and %(cond)s `tabProject`.name like "%(txt)s" %(mcond)s
order by `tabProject`.name asc
- limit %(start)s, %(page_len)s """ % {'cond': cond,'txt': "%%%s%%" % txt,
+ limit %(start)s, %(page_len)s """ % {'cond': cond,'txt': "%%%s%%" % frappe.db.escape(txt),
'mcond':get_match_cond(doctype),'start': start, 'page_len': page_len})
def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len, filters):
@@ -229,9 +229,10 @@
}, { "start": start, "page_len": page_len, "txt": ("%%%s%%" % txt) })
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
- if not filters.get("posting_date"):
- filters["posting_date"] = nowdate()
-
+ cond = ""
+ if filters.get("posting_date"):
+ cond = "and (ifnull(batch.expiry_date, '')='' or batch.expiry_date >= %(posting_date)s)"
+
batch_nos = None
args = {
'item_code': filters.get("item_code"),
@@ -251,23 +252,23 @@
and sle.warehouse = %(warehouse)s
and sle.batch_no like %(txt)s
and batch.docstatus < 2
- and (ifnull(batch.expiry_date, '')='' or batch.expiry_date >= %(posting_date)s)
+ {0}
{match_conditions}
group by batch_no having sum(sle.actual_qty) > 0
order by batch.expiry_date, sle.batch_no desc
- limit %(start)s, %(page_len)s""".format(match_conditions=get_match_cond(doctype)), args)
+ limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args)
if batch_nos:
return batch_nos
else:
- return frappe.db.sql("""select name, expiry_date from `tabBatch`
+ return frappe.db.sql("""select name, expiry_date from `tabBatch` batch
where item = %(item_code)s
and name like %(txt)s
and docstatus < 2
- and (ifnull(expiry_date, '')='' or expiry_date >= %(posting_date)s)
+ {0}
{match_conditions}
order by expiry_date, name desc
- limit %(start)s, %(page_len)s""".format(match_conditions=get_match_cond(doctype)), args)
+ limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args, debug=1)
def get_account_list(doctype, txt, searchfield, start, page_len, filters):
filter_list = []
diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index a46fa32..f9ab509 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -33,11 +33,13 @@
next_date = next_date or nowdate()
date_field = date_field_map[doctype]
+
+ condition = " and ifnull(status, '') != 'Stopped'" if doctype in ("Sales Order", "Purchase Order") else ""
recurring_documents = frappe.db.sql("""select name, recurring_id
- from `tab{}` where ifnull(is_recurring, 0)=1
- and docstatus=1 and next_date='{}'
- and next_date <= ifnull(end_date, '2199-12-31')""".format(doctype, next_date))
+ from `tab{0}` where ifnull(is_recurring, 0)=1
+ and docstatus=1 and next_date=%s
+ and next_date <= ifnull(end_date, '2199-12-31') {1}""".format(doctype, condition), next_date)
exception_list = []
for ref_document, recurring_id in recurring_documents:
@@ -124,7 +126,7 @@
frappe.sendmail(new_rv.notification_email_address,
subject= _("New {0}: #{1}").format(new_rv.doctype, new_rv.name),
message = _("Please find attached {0} #{1}").format(new_rv.doctype, new_rv.name),
- attachments = [frappe.attach_print(new_rv.doctype, new_rv.name, file_name=new_rv.name)])
+ attachments = [frappe.attach_print(new_rv.doctype, new_rv.name, file_name=new_rv.name, print_format=new_rv.recurring_print_format)])
def notify_errors(doc, doctype, party, owner):
from frappe.utils.user import get_system_managers
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 2dde685..c709326 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -85,9 +85,9 @@
existing_shipping_charge = self.get("taxes", filters=shipping_charge)
if existing_shipping_charge:
# take the last record found
- existing_shipping_charge[-1].rate = shipping_amount
+ existing_shipping_charge[-1].tax_amount = shipping_amount
else:
- shipping_charge["rate"] = shipping_amount
+ shipping_charge["tax_amount"] = shipping_amount
shipping_charge["description"] = shipping_rule.label
self.append("taxes", shipping_charge)
@@ -172,7 +172,7 @@
if self.doctype == "Sales Order":
if (frappe.db.get_value("Item", d.item_code, "is_stock_item") == 'Yes' or
- self.has_sales_bom(d.item_code)) and not d.warehouse:
+ self.has_product_bundle(d.item_code)) and not d.warehouse:
frappe.throw(_("Reserved Warehouse required for stock Item {0} in row {1}").format(d.item_code, d.idx))
reserved_warehouse = d.warehouse
if flt(d.qty) > flt(d.delivered_qty):
@@ -191,7 +191,7 @@
else:
reserved_qty_for_main_item = -flt(d.qty)
- if self.has_sales_bom(d.item_code):
+ if self.has_product_bundle(d.item_code):
for p in self.get("packed_items"):
if p.parent_detail_docname == d.name and p.parent_item == d.item_code:
# the packing details table's qty is already multiplied with parent's qty
@@ -221,8 +221,8 @@
}))
return il
- def has_sales_bom(self, item_code):
- return frappe.db.sql("""select name from `tabSales BOM`
+ def has_product_bundle(self, item_code):
+ return frappe.db.sql("""select name from `tabProduct Bundle`
where new_item_code=%s and docstatus != 2""", item_code)
def get_already_delivered_qty(self, dn, so, so_detail):
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 2f83cb9..c7d2439 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -78,7 +78,7 @@
self.status = s[0]
break
- if self.status != _status:
+ if self.status != _status and self.status not in ("Submitted", "Cancelled"):
self.add_comment("Label", _(self.status))
if update:
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index e095426..b2aa31a 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -29,7 +29,7 @@
"fieldtype": "Data",
"in_filter": 1,
"in_list_view": 0,
- "label": "Contact Name",
+ "label": "Person Name",
"oldfieldname": "lead_name",
"oldfieldtype": "Data",
"permlevel": 0,
@@ -344,7 +344,7 @@
],
"icon": "icon-user",
"idx": 1,
- "modified": "2015-04-02 15:13:02.621854",
+ "modified": "2015-07-03 03:26:18.579905",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index b523416..12de2e5 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -75,8 +75,7 @@
return frappe.db.get_value("Customer", {"lead_name": self.name})
def has_opportunity(self):
- return frappe.db.get_value("Opportunity", {"lead": self.name, "docstatus": 1,
- "status": ["!=", "Lost"]})
+ return frappe.db.get_value("Opportunity", {"lead": self.name, "status": ["!=", "Lost"]})
@frappe.whitelist()
def make_customer(source_name, target_doc=None):
diff --git a/erpnext/crm/doctype/newsletter/newsletter.py b/erpnext/crm/doctype/newsletter/newsletter.py
index 6b1633f..30fd101 100644
--- a/erpnext/crm/doctype/newsletter/newsletter.py
+++ b/erpnext/crm/doctype/newsletter/newsletter.py
@@ -8,7 +8,9 @@
from frappe import throw, _
from frappe.model.document import Document
from frappe.email.bulk import check_bulk_limit
+from frappe.utils.verified_command import get_signed_params, verify_request
import erpnext.tasks
+from erpnext.crm.doctype.newsletter_list.newsletter_list import add_subscribers
class Newsletter(Document):
def onload(self):
@@ -87,12 +89,11 @@
@frappe.whitelist(allow_guest=True)
def unsubscribe(email, name):
- from frappe.utils.verified_command import verify_request
if not verify_request():
return
subs_id = frappe.db.get_value("Newsletter List Subscriber", {"email": email, "newsletter_list": name})
- if name:
+ if subs_id:
subscriber = frappe.get_doc("Newsletter List Subscriber", subs_id)
subscriber.unsubscribed = 1
subscriber.save(ignore_permissions=True)
@@ -123,3 +124,47 @@
"source": "Email"
})
lead.insert()
+
+
+@frappe.whitelist(allow_guest=True)
+def subscribe(email):
+ url = frappe.utils.get_url("/api/method/erpnext.crm.doctype.newsletter.newsletter.confirm_subscription") +\
+ "?" + get_signed_params({"email": email})
+
+ messages = (
+ _("Thank you for your interest in subscribing to our updates"),
+ _("Please verify your email id"),
+ url,
+ _("Click here to verify")
+ )
+
+ print url
+
+ content = """
+ <p>{0}. {1}.</p>
+ <p><a href="{2}">{3}</a></p>
+ """
+
+ frappe.sendmail(email, subject=_("Confirm Your Email"), content=content.format(*messages), bulk=True)
+
+@frappe.whitelist(allow_guest=True)
+def confirm_subscription(email):
+ if not verify_request():
+ return
+
+ if not frappe.db.exists("Newsletter List", _("Website")):
+ frappe.get_doc({
+ "doctype": "Newsletter List",
+ "title": _("Website")
+ }).insert(ignore_permissions=True)
+
+
+ frappe.flags.ignore_permissions = True
+
+ add_subscribers(_("Website"), email)
+ frappe.db.commit()
+
+ frappe.respond_as_web_page(_("Confirmed"), _("{0} has been successfully added to our Newsletter list.").format(email))
+
+
+
diff --git a/erpnext/crm/doctype/newsletter/test_newsletter.py b/erpnext/crm/doctype/newsletter/test_newsletter.py
index ce1d2d1..580982a 100644
--- a/erpnext/crm/doctype/newsletter/test_newsletter.py
+++ b/erpnext/crm/doctype/newsletter/test_newsletter.py
@@ -9,7 +9,16 @@
class TestNewsletter(unittest.TestCase):
def setUp(self):
- frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0")
+ if not frappe.get_all("Newsletter List Subscriber"):
+ for email in ["test_subscriber1@example.com", "test_subscriber2@example.com",
+ "test_subscriber3@example.com"]:
+ frappe.get_doc({
+ "doctype": "Newsletter List Subscriber",
+ "email": email,
+ "newsletter_list": "_Test Newsletter List"
+ }).insert()
+ else:
+ frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0")
def test_send(self):
self.send_newsletter()
@@ -39,6 +48,4 @@
newsletter.send_emails()
-
-
test_dependencies = ["Newsletter List"]
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.json b/erpnext/crm/doctype/newsletter_list/newsletter_list.json
index 3fa7f65..e5e5c15 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.json
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.json
@@ -32,6 +32,7 @@
"default": "0",
"fieldname": "total_subscribers",
"fieldtype": "Int",
+ "in_list_view": 1,
"label": "Total Subscribers",
"permlevel": 0,
"precision": "",
@@ -45,7 +46,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 0,
- "modified": "2015-03-18 08:08:37.692367",
+ "modified": "2015-07-15 07:18:30.094155",
"modified_by": "Administrator",
"module": "CRM",
"name": "Newsletter List",
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.py b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
index e4ba6b1..bf78676 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.py
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
@@ -5,15 +5,15 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
-from frappe.utils import validate_email_add, strip
+from frappe.utils import validate_email_add
from frappe import _
from email.utils import parseaddr
class NewsletterList(Document):
def onload(self):
singles = [d.name for d in frappe.db.get_all("DocType", "name", {"issingle": 1})]
- self.get("__onload").import_types = [d.parent \
- for d in frappe.db.get_all("DocField", "parent", {"options": "Email"}) if d.parent not in singles]
+ self.get("__onload").import_types = [{"value": d.parent, "label": "{0} ({1})".format(d.parent, d.label)} \
+ for d in frappe.db.get_all("DocField", ("parent", "label"), {"options": "Email"}) if d.parent not in singles]
def import_from(self, doctype):
"""Extract email ids from given doctype and add them to the current list"""
@@ -44,11 +44,14 @@
return self.update_total_subscribers()
def update_total_subscribers(self):
- self.total_subscribers = frappe.db.sql("""select count(*) from `tabNewsletter List Subscriber`
- where newsletter_list=%s""", self.name)[0][0]
+ self.total_subscribers = self.get_total_subscribers()
self.db_update()
return self.total_subscribers
+ def get_total_subscribers(self):
+ return frappe.db.sql("""select count(*) from `tabNewsletter List Subscriber`
+ where newsletter_list=%s""", self.name)[0][0]
+
def on_trash(self):
for d in frappe.get_all("Newsletter List Subscriber", "name", {"newsletter_list": self.name}):
frappe.delete_doc("Newsletter List Subscriber", d.name)
@@ -75,7 +78,7 @@
"doctype": "Newsletter List Subscriber",
"newsletter_list": name,
"email": email
- }).insert()
+ }).insert(ignore_permissions = frappe.flags.ignore_permissions)
count += 1
else:
diff --git a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
index c715d85..ebc094e 100644
--- a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
+++ b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
@@ -6,8 +6,6 @@
import frappe
import unittest
-# test_records = frappe.get_test_records('Newletter List')
-
class TestNewletterList(unittest.TestCase):
def test_import(self):
new_list = frappe.get_doc({
@@ -15,13 +13,13 @@
"title": "_Test Newsletter List 1"
}).insert()
- n_leads = frappe.db.count("Lead")
-
+ n_leads = frappe.db.sql("select count(distinct email_id) from `tabLead`")[0][0]
+
added = new_list.import_from("Lead")
-
self.assertEquals(added, n_leads)
- frappe.delete_doc("Newsletter List", new_list.name)
+ def tearDown(self):
+ frappe.delete_doc("Newsletter List", "_Test Newsletter List 1")
test_dependencies = ["Lead"]
diff --git a/erpnext/crm/doctype/newsletter_list/test_records.json b/erpnext/crm/doctype/newsletter_list/test_records.json
index 5afc9df..ed2f89e 100644
--- a/erpnext/crm/doctype/newsletter_list/test_records.json
+++ b/erpnext/crm/doctype/newsletter_list/test_records.json
@@ -2,20 +2,5 @@
{
"doctype": "Newsletter List",
"title": "_Test Newsletter List"
- },
- {
- "doctype": "Newsletter List Subscriber",
- "email": "test_subscriber1@example.com",
- "newsletter_list": "_Test Newsletter List"
- },
- {
- "doctype": "Newsletter List Subscriber",
- "email": "test_subscriber2@example.com",
- "newsletter_list": "_Test Newsletter List"
- },
- {
- "doctype": "Newsletter List Subscriber",
- "email": "test_subscriber3@example.com",
- "newsletter_list": "_Test Newsletter List"
}
]
diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
index 1539553..c036adc 100644
--- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
+++ b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
@@ -10,4 +10,4 @@
pass
def after_doctype_insert():
- frappe.db.add_unique("Newsletter List Subscriber", ("name", "email"))
+ frappe.db.add_unique("Newsletter List Subscriber", ("newsletter_list", "email"))
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 0225398..78729a3 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -79,7 +79,8 @@
if self.customer:
self.customer_name = frappe.db.get_value("Customer", self.customer, "customer_name")
elif self.lead:
- self.customer_name = frappe.db.get_value("Lead", self.lead, "lead_name")
+ lead_name, company_name = frappe.db.get_value("Lead", self.lead, ["lead_name", "company_name"])
+ self.customer_name = company_name or lead_name
def get_cust_address(self,name):
details = frappe.db.sql("""select customer_name, address, territory, customer_group
diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index d33fdca..d809f5b 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
@@ -85,7 +85,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -134,7 +134,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:55:18.325286",
+ "modified": "2015-06-02 14:18:16.622288",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity Item",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index aa8638e..30032f8 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -5,7 +5,7 @@
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "5.0.5"
+app_version = "5.1.6"
error_report_email = "support@erpnext.com"
@@ -25,8 +25,13 @@
# website
update_website_context = "erpnext.shopping_cart.utils.update_website_context"
my_account_context = "erpnext.shopping_cart.utils.update_my_account_context"
+
email_append_to = ["Job Applicant", "Opportunity", "Issue"]
+calendars = ["Task", "Production Order", "Time Log", "Leave Application"]
+
+website_generators = ["Item Group", "Item", "Sales Partner"]
+
website_context = {
"favicon": "/assets/erpnext/images/favicon.png",
"splash_image": "/assets/erpnext/images/splash.png"
@@ -34,34 +39,28 @@
website_route_rules = [
{"from_route": "/orders", "to_route": "Sales Order"},
- {"from_route": "/orders/<name>", "to_route": "print", "defaults": {"doctype": "Sales Order"}},
+ {"from_route": "/orders/<path:name>", "to_route": "print", "defaults": {"doctype": "Sales Order"}},
{"from_route": "/invoices", "to_route": "Sales Invoice"},
- {"from_route": "/invoices/<name>", "to_route": "print", "defaults": {"doctype": "Sales Invoice"}},
+ {"from_route": "/invoices/<path:name>", "to_route": "print", "defaults": {"doctype": "Sales Invoice"}},
{"from_route": "/shipments", "to_route": "Delivery Note"},
- {"from_route": "/shipments/<name>", "to_route": "print", "defaults": {"doctype": "Delivery Note"}},
- {"from_route": "/issues", "to_route": "Issue"},
- {"from_route": "/issues/<name>", "to_route": "print", "defaults": {"doctype": "Issue"}},
- {"from_route": "/addresses", "to_route": "Address"},
+ {"from_route": "/shipments/<path:name>", "to_route": "print", "defaults": {"doctype": "Delivery Note"}}
]
has_website_permission = {
"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
"Sales Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
- "Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission"
+ "Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
+ "Issue": "erpnext.support.doctype.issue.issue.has_website_permission"
}
dump_report_map = "erpnext.startup.report_data_map.data_map"
before_tests = "erpnext.setup.utils.before_tests"
-website_generators = ["Item Group", "Item", "Sales Partner"]
-
standard_queries = {
"Customer": "erpnext.selling.doctype.customer.customer.get_customer_list"
}
-communication_covert_to = ["Lead", "Issue", "Job Application"]
-
doc_events = {
"Stock Entry": {
"on_submit": "erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty",
@@ -80,8 +79,10 @@
}
scheduler_events = {
+ "hourly": [
+ "erpnext.controllers.recurring_document.create_recurring_documents"
+ ],
"daily": [
- "erpnext.controllers.recurring_document.create_recurring_documents",
"erpnext.stock.reorder_item.reorder_item",
"erpnext.setup.doctype.email_digest.email_digest.send",
"erpnext.support.doctype.issue.issue.auto_close_tickets",
@@ -96,8 +97,8 @@
]
}
-default_mail_footer = """<div style="padding: 7px; margin-top: 7px;">
- <a style="color: #8D99A6; font-size: 85%; text-decoration: none;" href="https://erpnext.com" target="_blank">
+default_mail_footer = """<div style="padding: 15px; text-align: center;">
+ <a href="https://erpnext.com?source=via_email_footer" target="_blank" style="color: #8d99a6;">
Sent via ERPNext
</a>
</div>"""
@@ -106,4 +107,3 @@
("page", "setup-wizard"): "frappe.geo.country_info.get_translated_dict",
("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"
}
-
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 7dfc0b8..710f4e2 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -290,6 +290,7 @@
"label": "Company Email",
"oldfieldname": "company_email",
"oldfieldtype": "Data",
+ "options": "Email",
"permlevel": 0,
"reqd": 0
},
@@ -385,6 +386,7 @@
"fieldname": "personal_email",
"fieldtype": "Data",
"label": "Personal Email",
+ "options": "Email",
"permlevel": 0
},
{
@@ -674,7 +676,7 @@
],
"icon": "icon-user",
"idx": 1,
- "modified": "2015-02-20 05:02:14.205144",
+ "modified": "2015-07-09 02:25:20.987412",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index cb0ce11..a2bb10c 100644
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -45,6 +45,10 @@
if self.user_id:
self.validate_for_enabled_user_id()
self.validate_duplicate_user_id()
+ else:
+ existing_user_id = frappe.db.get_value("Employee", self.name, "user_id")
+ if existing_user_id:
+ frappe.permissions.remove_user_permission("Employee", self.name, existing_user_id)
def on_update(self):
if self.user_id:
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index d279074..b556172 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -63,7 +63,7 @@
cur_frm.set_query("exp_approver", function() {
return {
- filters: [["UserRole", "role", "=", "Expense Approver"]]
+ query: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver"
};
});
}
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index 6687399..112a626 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -58,4 +58,13 @@
def validate_sanctioned_amount(self):
for d in self.get('expenses'):
if flt(d.sanctioned_amount) > flt(d.claim_amount):
- frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
\ No newline at end of file
+ frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
+
+
+@frappe.whitelist()
+def get_expense_approver(doctype, txt, searchfield, start, page_len, filters):
+ return frappe.db.sql("""
+ select u.name, concat(u.first_name, ' ', u.last_name)
+ from tabUser u, tabUserRole r
+ where u.name = r.parent and r.role = 'Expense Approver' and u.name like %s
+ """, ("%" + txt + "%"))
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index 688fa39..fc7e604 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -29,7 +29,7 @@
],
"icon": "icon-flag",
"idx": 1,
- "modified": "2015-04-19 06:47:51.860833",
+ "modified": "2015-07-13 04:46:38.897484",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim Type",
@@ -55,7 +55,7 @@
"print": 0,
"read": 1,
"report": 0,
- "role": "All",
+ "role": "Employee",
"share": 0,
"write": 0
}
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
index 272ec39..4e74b28 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
@@ -23,9 +23,6 @@
def on_update(self):
self.get_total_allocated_leaves()
- def on_cancel(self):
- self.check_for_leave_application()
-
def validate_new_leaves_allocated_value(self):
"""validate that leave allocation is in multiples of 0.5"""
if flt(self.new_leaves_allocated) % 0.5:
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index cd32b9c..de1c2b0 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -130,6 +130,7 @@
"description": "",
"fieldname": "leave_approver",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Leave Approver",
"options": "User",
"permlevel": 0
@@ -216,7 +217,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 3,
- "modified": "2015-04-30 02:19:39.330689",
+ "modified": "2015-05-27 18:44:36.708614",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index c75c2bd..44fb6fd 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -339,6 +339,7 @@
events.append({
"doctype": "Leave Block List Date",
"from_date": block_date.block_date,
+ "to_date": block_date.block_date,
"title": _("Leave Blocked") + ": " + block_date.reason,
"name": "_" + str(cnt),
})
@@ -355,6 +356,7 @@
events.append({
"doctype": "Holiday",
"from_date": holiday.holiday_date,
+ "to_date": holiday.holiday_date,
"title": _("Holiday") + ": " + cstr(holiday.description),
"name": holiday.name
})
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
index 8ab893a..3720f2f 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -24,4 +24,8 @@
cur_frm.cscript.allocation_type = function (doc, cdt, cdn){
doc.no_of_days = '';
refresh_field('no_of_days');
-}
\ No newline at end of file
+}
+
+frappe.ui.form.on("Leave Control Panel", "refresh", function(frm) {
+ frm.disable_save();
+});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index 2eb4eb6..dead10b 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -94,11 +94,11 @@
}
],
"hide_heading": 0,
- "hide_toolbar": 0,
+ "hide_toolbar": 1,
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
- "modified": "2015-02-05 05:11:40.791976",
+ "modified": "2015-06-05 11:38:19.994852",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Control Panel",
@@ -110,7 +110,7 @@
"read": 1,
"report": 0,
"role": "HR User",
- "share": 1,
+ "share": 0,
"submit": 0,
"write": 1
}
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/hr/doctype/process_payroll/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/hr/doctype/process_payroll/__init__.py
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
similarity index 65%
rename from erpnext/hr/doctype/salary_manager/salary_manager.js
rename to erpnext/hr/doctype/process_payroll/process_payroll.js
index 834f5d4..d882349 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -1,30 +1,44 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-var display_activity_log = function(msg) {
+cur_frm.cscript.display_activity_log = function(msg) {
if(!cur_frm.ss_html)
cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
- cur_frm.ss_html.innerHTML =
- '<div class="padding"><h4>'+__("Activity Log:")+'</h4>'+msg+'</div>';
+ if(msg) {
+ cur_frm.ss_html.innerHTML =
+ '<div class="padding"><h4>'+__("Activity Log:")+'</h4>'+msg+'</div>';
+ } else {
+ cur_frm.ss_html.innerHTML = "";
+ }
}
//Create salary slip
//-----------------------
cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) {
+ cur_frm.cscript.display_activity_log("");
var callback = function(r, rt){
if (r.message)
- display_activity_log(r.message);
+ cur_frm.cscript.display_activity_log(r.message);
}
return $c('runserverobj', args={'method':'create_sal_slip','docs':doc},callback);
}
cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
+ cur_frm.cscript.display_activity_log("");
var check = confirm(__("Do you really want to Submit all Salary Slip for month {0} and year {1}", [doc.month, doc.fiscal_year]));
if(check){
+ // clear all in locals
+ if(locals["Salary Slip"]) {
+ $.each(locals["Salary Slip"], function(name, d) {
+ frappe.model.remove_from_locals("Salary Slip", name);
+ });
+ }
+
var callback = function(r, rt){
if (r.message)
- display_activity_log(r.message);
+ cur_frm.cscript.display_activity_log(r.message);
}
+
return $c('runserverobj', args={'method':'submit_salary_slip','docs':doc},callback);
}
}
@@ -43,3 +57,8 @@
frappe.set_route("Form", doc.doctype, doc.name);
});
}
+
+
+frappe.ui.form.on("Process Payroll", "refresh", function(frm) {
+ frm.disable_save();
+});
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
similarity index 96%
rename from erpnext/hr/doctype/salary_manager/salary_manager.json
rename to erpnext/hr/doctype/process_payroll/process_payroll.json
index 21560a4..36e858c 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -150,13 +150,14 @@
"permlevel": 0
}
],
+ "hide_toolbar": 1,
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
- "modified": "2015-02-25 07:21:04.778082",
+ "modified": "2015-07-07 07:16:02.380839",
"modified_by": "Administrator",
"module": "HR",
- "name": "Salary Manager",
+ "name": "Process Payroll",
"owner": "Administrator",
"permissions": [
{
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
similarity index 94%
rename from erpnext/hr/doctype/salary_manager/salary_manager.py
rename to erpnext/hr/doctype/process_payroll/process_payroll.py
index eeb6ac0..4900bd0 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -8,7 +8,7 @@
from frappe.model.document import Document
-class SalaryManager(Document):
+class ProcessPayroll(Document):
def get_emp_list(self):
"""
@@ -101,7 +101,7 @@
log = "<p>No employee for the above selected criteria OR salary slip already created</p>"
if ss_list:
log = "<b>Salary Slip Created For</b>\
- <br><br>%s" % '<br>'.join(ss_list)
+ <br><br>%s" % '<br>'.join(self.format_as_links(ss_list))
return log
@@ -144,7 +144,7 @@
else:
all_ss = [d[0] for d in all_ss]
- submitted_ss = list(set(all_ss) - set(not_submitted_ss))
+ submitted_ss = self.format_as_links(list(set(all_ss) - set(not_submitted_ss)))
if submitted_ss:
mail_sent_msg = self.send_email and " (Mail has been sent to the employee)" or ""
log = """
@@ -164,6 +164,9 @@
"""% ('<br>'.join(not_submitted_ss))
return log
+ def format_as_links(self, ss_list):
+ return ['<a href="#Form/Salary Slip/{0}">{0}</a>'.format(s) for s in ss_list]
+
def get_total_salary(self):
"""
diff --git a/erpnext/hr/doctype/salary_manager/README.md b/erpnext/hr/doctype/salary_manager/README.md
deleted file mode 100644
index 040d038..0000000
--- a/erpnext/hr/doctype/salary_manager/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Tool to issue monthly Salary Slips to all Employees.
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_manager/__init__.py b/erpnext/hr/doctype/salary_manager/__init__.py
deleted file mode 100644
index f24df48..0000000
--- a/erpnext/hr/doctype/salary_manager/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Frappe Technologies Pvt Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-from frappe import ValidationError
-
-class SalarySlipExistsError(ValidationError): pass
-
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index dd54490..24079c1 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -49,7 +49,7 @@
if not self.month:
self.month = "%02d" % getdate(nowdate()).month
- m = frappe.get_doc('Salary Manager').get_month_details(self.fiscal_year, self.month)
+ m = frappe.get_doc('Process Payroll').get_month_details(self.fiscal_year, self.month)
holidays = self.get_holidays_for_employee(m)
if not cint(frappe.db.get_value("HR Settings", "HR Settings",
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 9f7c5df..2bb7f52 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -12,6 +12,9 @@
def setUp(self):
frappe.db.sql("""delete from `tabLeave Application`""")
frappe.db.sql("""delete from `tabSalary Slip`""")
+
+ frappe.db.set_value("Holiday List", "_Test Holiday List", "is_default", 1)
+
from erpnext.hr.doctype.leave_application.test_leave_application import _test_records as leave_applications
la = frappe.copy_doc(leave_applications[2])
la.insert()
@@ -26,6 +29,7 @@
frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 1)
ss = frappe.copy_doc(test_records[0])
ss.insert()
+
self.assertEquals(ss.total_days_in_month, 31)
self.assertEquals(ss.payment_days, 30)
self.assertEquals(ss.earnings[0].e_modified_amount, 14516.13)
@@ -36,8 +40,10 @@
self.assertEquals(ss.net_pay, 14867.74)
def test_salary_slip_with_holidays_excluded(self):
+ frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0)
ss = frappe.copy_doc(test_records[0])
ss.insert()
+
self.assertEquals(ss.total_days_in_month, 30)
self.assertEquals(ss.payment_days, 29)
self.assertEquals(ss.earnings[0].e_modified_amount, 14500)
@@ -102,6 +108,6 @@
return salary_slip
-test_dependencies = ["Leave Application"]
+test_dependencies = ["Leave Application", "Holiday List"]
test_records = frappe.get_test_records('Salary Slip')
diff --git a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
index 4b4e59c..b8079f3 100644
--- a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
+++ b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
@@ -31,7 +31,7 @@
"fieldname": "d_depends_on_lwp",
"fieldtype": "Check",
"in_list_view": 0,
- "label": "Depends on LWP",
+ "label": "Depends on Leave Without Pay",
"permlevel": 0,
"print_hide": 1
},
@@ -46,7 +46,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-03-03 12:41:04.505378",
+ "modified": "2015-07-07 07:13:11.919941",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip Deduction",
diff --git a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
index 4359905..a0804e2 100644
--- a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
+++ b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
@@ -31,7 +31,7 @@
"fieldname": "e_depends_on_lwp",
"fieldtype": "Check",
"in_list_view": 0,
- "label": "Depends on LWP",
+ "label": "Depends on Leave Without Pay",
"permlevel": 0,
"print_hide": 1
},
@@ -46,7 +46,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-03-03 12:42:49.087748",
+ "modified": "2015-07-07 07:13:24.833881",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip Earning",
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index 8580f2e..69f341b 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cstr, flt
+from frappe.utils import cstr, flt, getdate
from frappe.model.naming import make_autoname
from frappe import _
from frappe.model.mapper import get_mapped_doc
@@ -14,6 +14,13 @@
class SalaryStructure(Document):
def autoname(self):
self.name = make_autoname(self.employee + '/.SST' + '/.#####')
+
+ def validate(self):
+ self.check_existing()
+ self.validate_amount()
+ self.validate_employee()
+ self.validate_joining_date()
+ set_employee_name(self)
def get_employee_details(self):
ret = {}
@@ -77,14 +84,11 @@
old_employee = frappe.db.get_value("Salary Structure", self.name, "employee")
if old_employee and self.employee != old_employee:
frappe.throw(_("Employee can not be changed"))
-
-
- def validate(self):
- self.check_existing()
- self.validate_amount()
- self.validate_employee()
- set_employee_name(self)
-
+
+ def validate_joining_date(self):
+ joining_date = getdate(frappe.db.get_value("Employee", self.employee, "date_of_joining"))
+ if getdate(self.from_date) < joining_date:
+ frappe.throw(_("From Date in Salary Structure cannot be lesser than Employee Joining Date."))
@frappe.whitelist()
def make_salary_slip(source_name, target_doc=None):
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.js b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
index c0c8490..47ffec0 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.js
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
@@ -12,6 +12,7 @@
},
refresh: function() {
+ this.frm.disable_save();
this.show_upload();
},
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.json b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
index 195879d..ab18f5d 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@@ -1,4 +1,5 @@
{
+ "allow_copy": 1,
"creation": "2013-01-25 11:34:53",
"docstatus": 0,
"doctype": "DocType",
@@ -53,11 +54,13 @@
"permlevel": 0
}
],
+ "hide_heading": 0,
+ "hide_toolbar": 1,
"icon": "icon-upload-alt",
"idx": 1,
"issingle": 1,
"max_attachments": 1,
- "modified": "2015-02-05 05:11:48.540845",
+ "modified": "2015-06-05 11:37:04.348120",
"modified_by": "Administrator",
"module": "HR",
"name": "Upload Attendance",
@@ -65,25 +68,25 @@
"permissions": [
{
"create": 1,
- "email": 1,
+ "email": 0,
"permlevel": 0,
- "print": 1,
+ "print": 0,
"read": 1,
"report": 0,
"role": "HR User",
- "share": 1,
+ "share": 0,
"submit": 0,
"write": 1
},
{
"create": 1,
- "email": 1,
+ "email": 0,
"permlevel": 0,
- "print": 1,
+ "print": 0,
"read": 1,
"report": 0,
"role": "HR Manager",
- "share": 1,
+ "share": 0,
"submit": 0,
"write": 1
}
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
index e012d78..f53acca 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
@@ -75,8 +75,20 @@
filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
"Dec"].index(filters["month"]) + 1
+ from frappe.model.document import Document
+ fiscal_years = frappe.get_doc("Fiscal Year",filters["fiscal_year"])
+ import datetime
+ year_start = fiscal_years.year_start_date.strftime("%Y")
+ year_end = fiscal_years.year_end_date.strftime("%Y")
+ dt_test = datetime.datetime.strptime(year_end + "-" + str(100+int(filters["month"]))[2:3] + "-01", "%Y-%m-%d")
+ date_test = datetime.date(dt_test.year, dt_test.month, dt_test.day)
+ if date_test > fiscal_years.year_end_date:
+ year_target = year_start
+ else:
+ year_target = year_end
+
from calendar import monthrange
- filters["total_days_in_month"] = monthrange(cint(filters["fiscal_year"].split("-")[-1]),
+ filters["total_days_in_month"] = monthrange(cint(year_target),
filters["month"])[1]
conditions = " and month(att_date) = %(month)s and fiscal_year = %(fiscal_year)s"
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 699b272..f0eebb1 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -1,27 +1,36 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-// On REFRESH
frappe.provide("erpnext.bom");
-cur_frm.cscript.refresh = function(doc,dt,dn){
- cur_frm.toggle_enable("item", doc.__islocal);
- toggle_operations(cur_frm);
- if (!doc.__islocal && doc.docstatus<2) {
- cur_frm.add_custom_button(__("Update Cost"), cur_frm.cscript.update_cost);
- }
-}
+frappe.ui.form.on("BOM", {
+ onload_post_render: function(frm) {
+ frm.get_field("items").grid.set_multiple_add("item_code", "qty");
+ },
+ refresh: function(frm) {
+ frm.toggle_enable("item", frm.doc.__islocal);
+ toggle_operations(frm);
-cur_frm.cscript.update_cost = function() {
- return frappe.call({
- doc: cur_frm.doc,
- method: "update_cost",
- freeze: true,
- callback: function(r) {
- if(!r.exc) cur_frm.refresh_fields();
+ if (!frm.doc.__islocal && frm.doc.docstatus<2) {
+ frm.add_custom_button(__("Update Cost"), function() {
+ frm.events.update_cost(frm);
+ });
+ frm.add_custom_button(__("Browse BOM"), function() {
+ frappe.set_route("bom-browser", frm.doc.name);
+ });
}
- })
-}
+ },
+ update_cost: function(frm) {
+ return frappe.call({
+ doc: frm.doc,
+ method: "update_cost",
+ freeze: true,
+ callback: function(r) {
+ if(!r.exc) frm.refresh_fields();
+ }
+ })
+ }
+});
cur_frm.add_fetch("item", "description", "description");
cur_frm.add_fetch("item", "image", "image");
@@ -35,7 +44,6 @@
}
cur_frm.cscript.time_in_mins = cur_frm.cscript.hour_rate;
-cur_frm.cscript.fixed_cycle_cost = cur_frm.cscript.hour_rate;
cur_frm.cscript.item_code = function(doc, cdt, cdn) {
get_bom_material_detail(doc, cdt, cdn);
@@ -53,7 +61,7 @@
var d = locals[cdt][cdn];
if (d.item_code) {
return frappe.call({
- doc: cur_frm.doc,
+ doc: doc,
method: "get_bom_material_detail",
args: {
'item_code': d.item_code,
@@ -226,5 +234,3 @@
cur_frm.cscript.image = function() {
refresh_field("image_view");
}
-
-
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 239df47..67e2b78 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -12,7 +12,7 @@
"fieldname": "item",
"fieldtype": "Link",
"in_filter": 1,
- "in_list_view": 0,
+ "in_list_view": 1,
"label": "Item",
"oldfieldname": "item",
"oldfieldtype": "Link",
@@ -54,7 +54,7 @@
"fieldname": "is_active",
"fieldtype": "Check",
"hidden": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"label": "Is Active",
"no_copy": 1,
"oldfieldname": "is_active",
@@ -67,7 +67,7 @@
"default": "1",
"fieldname": "is_default",
"fieldtype": "Check",
- "in_list_view": 0,
+ "in_list_view": 1,
"label": "Is Default",
"no_copy": 1,
"oldfieldname": "is_default",
@@ -279,7 +279,7 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
- "modified": "2015-03-03 14:22:44.725097",
+ "modified": "2015-06-26 02:02:30.705279",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM",
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 4c87dc7..fe67ed8 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -181,15 +181,12 @@
if item.default_bom != self.name:
item.default_bom = self.name
item.save()
-
else:
- if not self.is_active:
- frappe.db.set(self, "is_default", 0)
-
- item = frappe.get_doc("Item", self.item)
- if item.default_bom == self.name:
- item.default_bom = None
- item.save()
+ frappe.db.set(self, "is_default", 0)
+ item = frappe.get_doc("Item", self.item)
+ if item.default_bom == self.name:
+ item.default_bom = None
+ item.save()
def clear_operations(self):
if not self.with_operations:
@@ -424,6 +421,6 @@
if bom.docstatus != 1:
if not getattr(frappe.flags, "in_test", False):
frappe.throw(_("BOM {0} must be submitted").format(bom_no))
- if item and not (bom.item == item or \
- bom.item == frappe.db.get_value("Item", item, "variant_of")):
+ if item and not (bom.item.lower() == item.lower() or \
+ bom.item.lower() == cstr(frappe.db.get_value("Item", item, "variant_of")).lower()):
frappe.throw(_("BOM {0} does not belong to Item {1}").format(bom_no, item))
diff --git a/erpnext/manufacturing/doctype/bom/bom_list.js b/erpnext/manufacturing/doctype/bom/bom_list.js
index c73ed0d..2b06ed7 100644
--- a/erpnext/manufacturing/doctype/bom/bom_list.js
+++ b/erpnext/manufacturing/doctype/bom/bom_list.js
@@ -10,3 +10,5 @@
}
}
};
+
+frappe.help.youtube_id["BOM"] = "hDV0c1OeWLo";
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 4149046..ea9569f 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -55,6 +55,13 @@
"label": "Time Between Operations (in mins)",
"permlevel": 0,
"precision": ""
+ },
+ {
+ "fieldname": "over_production_allowance_percentage",
+ "fieldtype": "Percent",
+ "label": "Over Production Allowance Percentage",
+ "permlevel": 0,
+ "precision": ""
}
],
"hide_heading": 0,
@@ -65,7 +72,7 @@
"is_submittable": 0,
"issingle": 1,
"istable": 0,
- "modified": "2015-04-21 07:57:40.260862",
+ "modified": "2015-06-15 05:52:22.986958",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing Settings",
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 3781450..17fa202 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -35,18 +35,20 @@
frappe.ui.form.on("Production Order Operation", "workstation", function(frm, cdt, cdn) {
var d = locals[cdt][cdn];
- frappe.call({
- "method": "frappe.client.get",
- args: {
- doctype: "Workstation",
- name: d.workstation
- },
- callback: function (data) {
- frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
- erpnext.production_order.calculate_cost(frm.doc);
- erpnext.production_order.calculate_total_cost(frm);
- }
- })
+ if (d.workstation) {
+ frappe.call({
+ "method": "frappe.client.get",
+ args: {
+ doctype: "Workstation",
+ name: d.workstation
+ },
+ callback: function (data) {
+ frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
+ erpnext.production_order.calculate_cost(frm.doc);
+ erpnext.production_order.calculate_total_cost(frm);
+ }
+ })
+ }
});
frappe.ui.form.on("Production Order Operation", "time_in_mins", function(frm, cdt, cdn) {
@@ -184,15 +186,26 @@
},
bom_no: function() {
- return this.frm.call({
- doc: this.frm.doc,
- method: "set_production_order_operations"
- });
+ if (this.frm.doc.track_operations) {
+ return this.frm.call({
+ doc: this.frm.doc,
+ method: "set_production_order_operations"
+ });
+ }
},
qty: function() {
frappe.ui.form.trigger("Production Order", 'bom_no')
},
+
+ track_operations: function(doc) {
+ if (doc.track_operations) {
+ frappe.ui.form.trigger("Production Order", 'bom_no')
+ }
+ else {
+ doc.operations =[];
+ }
+ },
show_time_logs: function(doc, cdt, cdn) {
var child = locals[cdt][cdn]
@@ -248,7 +261,8 @@
cur_frm.fields_dict['production_item'].get_query = function(doc) {
return {
filters:[
- ['Item', 'is_pro_applicable', '=', 'Yes']
+ ['Item', 'is_pro_applicable', '=', 'Yes'],
+ ['Item', 'has_variants', '=', 'No']
]
}
}
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index 07cc5c6..75aab99 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -74,6 +74,14 @@
"permlevel": 0
},
{
+ "default": "1",
+ "fieldname": "track_operations",
+ "fieldtype": "Check",
+ "label": "Track Operations",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -207,7 +215,7 @@
"read_only": 1
},
{
- "depends_on": "",
+ "depends_on": "track_operations",
"fieldname": "operations_section",
"fieldtype": "Section Break",
"label": "Operations",
@@ -216,6 +224,7 @@
"precision": ""
},
{
+ "depends_on": "",
"fieldname": "operations",
"fieldtype": "Table",
"label": "Operations",
@@ -225,6 +234,7 @@
"read_only": 1
},
{
+ "depends_on": "track_operations",
"fieldname": "section_break_22",
"fieldtype": "Section Break",
"label": "Operation Cost",
@@ -358,7 +368,7 @@
"idx": 1,
"in_create": 0,
"is_submittable": 1,
- "modified": "2015-04-13 02:44:17.319988",
+ "modified": "2015-07-13 05:28:23.259016",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Order",
@@ -385,7 +395,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
- "role": "Material User"
+ "role": "Stock User"
}
],
"title_field": "production_item"
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 6cd2ad2..26af40a 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -30,6 +30,7 @@
validate_status(self.status, ["Draft", "Submitted", "Stopped",
"In Process", "Completed", "Cancelled"])
+ self.validate_production_item()
if self.bom_no:
validate_bom_no(self.production_item, self.bom_no)
@@ -90,8 +91,9 @@
(self.sales_order, self.production_item))[0][0]
# total qty in SO
so_qty = flt(so_item_qty) + flt(dnpi_qty)
-
- if total_qty > so_qty:
+
+ allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings", "over_production_allowance_percentage"))
+ if total_qty > so_qty + (allowance_percentage/100 * so_qty):
frappe.throw(_("Cannot produce more Item {0} than Sales Order quantity {1}").format(self.production_item,
so_qty), OverProductionError)
@@ -172,22 +174,26 @@
def set_production_order_operations(self):
"""Fetch operations from BOM and set in 'Production Order'"""
-
+ if not self.bom_no:
+ return
self.set('operations', [])
-
operations = frappe.db.sql("""select operation, description, workstation, idx,
- hour_rate, time_in_mins, "Pending" as status from `tabBOM Operation`
+ hour_rate, time_in_mins, "Pending" as status from `tabBOM Operation`
where parent = %s order by idx""", self.bom_no, as_dict=1)
-
+ if operations:
+ self.track_operations=1
+ else:
+ self.track_operations=0
+ frappe.msgprint(_("Cannot 'track operations' as selected BOM does not have Operations."))
self.set('operations', operations)
self.calculate_time()
-
+
def calculate_time(self):
bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
-
+
for d in self.get("operations"):
d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * flt(self.qty)
-
+
self.calculate_operating_cost()
def get_holidays(self, workstation):
@@ -220,7 +226,9 @@
time_log = make_time_log(self.name, d.operation, d.planned_start_time, d.planned_end_time,
flt(self.qty) - flt(d.completed_qty), self.project_name, d.workstation, operation_id=d.name)
- self.check_operation_fits_in_working_hours(d)
+ if d.workstation:
+ # validate operating hours if workstation [not mandatory] is specified
+ self.check_operation_fits_in_working_hours(d)
original_start_time = time_log.from_time
while True:
@@ -307,14 +315,20 @@
self.actual_end_date = None
def validate_delivery_date(self):
- if self.docstatus==1:
- if self.planned_end_date and self.expected_delivery_date \
- and getdate(self.expected_delivery_date) < getdate(self.planned_end_date):
- frappe.msgprint(_("Production might not be able to finish by the Expected Delivery Date."))
+ if self.planned_start_date and self.expected_delivery_date \
+ and getdate(self.expected_delivery_date) < getdate(self.planned_start_date):
+ frappe.msgprint(_("Expected Delivery Date is lesser than Planned Start Date."))
def delete_time_logs(self):
for time_log in frappe.get_all("Time Log", ["name"], {"production_order": self.name}):
frappe.delete_doc("Time Log", time_log.name)
+
+ def validate_production_item(self):
+ if frappe.db.get_value("Item", self.production_item, "is_pro_applicable")=='No':
+ frappe.throw(_("Item is not allowed to have Production Order."))
+
+ if frappe.db.get_value("Item", self.production_item, "has_variants"):
+ frappe.throw(_("Production Order cannot be raised against a Item Template"))
@frappe.whitelist()
def get_item_details(item):
@@ -379,7 +393,7 @@
return data
@frappe.whitelist()
-def make_time_log(name, operation, from_time, to_time, qty=None, project=None, workstation=None, operation_id=None):
+def make_time_log(name, operation, from_time=None, to_time=None, qty=None, project=None, workstation=None, operation_id=None):
time_log = frappe.new_doc("Time Log")
time_log.for_manufacturing = 1
time_log.from_time = from_time
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
index 7b6425e..34d584a 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -130,10 +130,9 @@
prod_order = make_prod_order_test_record(item="_Test FG Item 2",
planned_start_date="2014-11-25 00:00:00", qty=1, do_not_save=True)
prod_order.set_production_order_operations()
- prod_order.save()
cost = prod_order.planned_operating_cost
prod_order.qty = 2
- prod_order.save()
+ prod_order.set_production_order_operations()
self.assertEqual(prod_order.planned_operating_cost, cost*2)
def make_prod_order_test_record(**args):
diff --git a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
index 8313485..c57d848 100644
--- a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
+++ b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
@@ -33,7 +33,7 @@
"print_hide": 0,
"read_only": 1,
"report_hide": 0,
- "reqd": 1,
+ "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -293,7 +293,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
- "modified": "2015-04-22 03:25:18.542350",
+ "modified": "2015-05-21 13:46:27.730392",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Order Operation",
diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
index 7134938..2c56569 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -43,6 +43,15 @@
"width": "100px"
},
{
+ "default": "",
+ "fieldname": "planned_start_date",
+ "fieldtype": "Datetime",
+ "label": "Planned Start Date",
+ "permlevel": 0,
+ "precision": "",
+ "reqd": 1
+ },
+ {
"fieldname": "sales_order",
"fieldtype": "Link",
"in_list_view": 1,
@@ -104,7 +113,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-02-19 01:07:00.936590",
+ "modified": "2015-07-08 07:12:11.211808",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan Item",
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
index 4f77132..f3b918d 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
@@ -1,6 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
+frappe.require("assets/erpnext/js/utils.js");
+
cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.set_value("company", frappe.defaults.get_user_default("company"))
cur_frm.set_value("use_multi_level_bom", 1)
@@ -72,3 +74,7 @@
cur_frm.fields_dict.sales_orders.grid.get_field("customer").get_query =
cur_frm.fields_dict.customer.get_query;
+
+cur_frm.cscript.planned_start_date = function(doc, cdt, cdn) {
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "planned_start_date");
+}
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
index f2c7cc7..e0ac26c 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
@@ -1,4 +1,5 @@
{
+ "allow_copy": 1,
"creation": "2013-01-21 12:03:47",
"default_print_format": "Standard",
"docstatus": 0,
@@ -154,11 +155,12 @@
"permlevel": 0
}
],
+ "hide_toolbar": 1,
"icon": "icon-calendar",
"idx": 1,
"in_create": 1,
"issingle": 1,
- "modified": "2015-02-05 05:11:43.010625",
+ "modified": "2015-06-05 11:44:31.629114",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Planning Tool",
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 1298790..86a14d8 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cstr, flt, cint, nowdate, now, add_days, comma_and
+from frappe.utils import cstr, flt, cint, nowdate, add_days, comma_and
from frappe import msgprint, _
@@ -185,20 +185,22 @@
"""
item_dict, bom_dict = {}, {}
for d in self.get("items"):
- bom_dict.setdefault(d.bom_no, []).append([d.sales_order, flt(d.planned_qty)])
- item_dict[(d.item_code, d.sales_order, d.warehouse)] = {
- "production_item" : d.item_code,
- "sales_order" : d.sales_order,
- "qty" : flt(item_dict.get((d.item_code, d.sales_order, d.warehouse),
- {}).get("qty")) + flt(d.planned_qty),
- "bom_no" : d.bom_no,
- "description" : d.description,
- "stock_uom" : d.stock_uom,
- "company" : self.company,
- "wip_warehouse" : "",
- "fg_warehouse" : d.warehouse,
- "status" : "Draft",
- }
+ if d.bom_no:
+ bom_dict.setdefault(d.bom_no, []).append([d.sales_order, flt(d.planned_qty)])
+ if frappe.db.get_value("Item", d.item_code, "is_pro_applicable") == "Yes":
+ item_dict[(d.item_code, d.sales_order, d.warehouse)] = {
+ "production_item" : d.item_code,
+ "sales_order" : d.sales_order,
+ "qty" : flt(item_dict.get((d.item_code, d.sales_order, d.warehouse),
+ {}).get("qty")) + flt(d.planned_qty),
+ "bom_no" : d.bom_no,
+ "description" : d.description,
+ "stock_uom" : d.stock_uom,
+ "company" : self.company,
+ "wip_warehouse" : "",
+ "fg_warehouse" : d.warehouse,
+ "status" : "Draft",
+ }
return bom_dict, item_dict
def create_production_order(self, items):
@@ -209,8 +211,6 @@
for key in items:
pro = frappe.new_doc("Production Order")
pro.update(items[key])
-
- pro.planned_start_date = now()
pro.set_production_order_operations()
frappe.flags.mute_messages = True
@@ -359,10 +359,7 @@
def insert_purchase_request(self):
items_to_be_requested = self.get_requested_items()
-
- from erpnext.accounts.utils import get_fiscal_year
- fiscal_year = get_fiscal_year(nowdate())[0]
-
+
purchase_request_list = []
if items_to_be_requested:
for item in items_to_be_requested:
@@ -372,7 +369,6 @@
"transaction_date": nowdate(),
"status": "Draft",
"company": self.company,
- "fiscal_year": fiscal_year,
"requested_by": frappe.session.user,
"material_request_type": "Purchase"
})
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index bc9b190..dae01df 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from frappe.utils import flt, cint, getdate, formatdate, comma_and, time_diff_in_seconds, get_datetime
+from frappe.utils import flt, cint, getdate, formatdate, comma_and, time_diff_in_seconds, to_timedelta
from frappe.model.document import Document
from dateutil.parser import parse
@@ -60,7 +60,7 @@
workstation = frappe.get_doc("Workstation", workstation)
for working_hour in workstation.working_hours:
- slot_length = (get_datetime(working_hour.end_time) - get_datetime(working_hour.start_time)).total_seconds()
+ slot_length = (to_timedelta(working_hour.end_time or "") - to_timedelta(working_hour.start_time or "")).total_seconds()
if slot_length >= operation_length:
return
diff --git a/erpnext/manufacturing/page/__init__.py b/erpnext/manufacturing/page/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/manufacturing/page/__init__.py
diff --git a/erpnext/manufacturing/page/bom_browser/__init__.py b/erpnext/manufacturing/page/bom_browser/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/manufacturing/page/bom_browser/__init__.py
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.js b/erpnext/manufacturing/page/bom_browser/bom_browser.js
new file mode 100644
index 0000000..453d8c5
--- /dev/null
+++ b/erpnext/manufacturing/page/bom_browser/bom_browser.js
@@ -0,0 +1,90 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.pages['bom-browser'].on_page_load = function(wrapper) {
+ var page = frappe.ui.make_app_page({
+ parent: wrapper,
+ title: 'BOM Browser',
+ single_column: true
+ });
+
+ page.main.css({
+ "min-height": "300px",
+ "padding-bottom": "25px"
+ });
+
+ page.tree_area = $('<div class="padding"><p class="text-muted">'+
+ __("Select BOM to start")
+ +'</p></div>').appendTo(page.main);
+
+ frappe.breadcrumbs.add(frappe.breadcrumbs.last_module || "Manufacturing");
+
+ var make_tree = function() {
+ erpnext.bom_tree = new erpnext.BOMTree(page.$bom_select.val(), page, page.tree_area);
+ }
+
+ page.$bom_select = wrapper.page.add_field({fieldname: "bom",
+ fieldtype:"Link", options: "BOM", label: __("BOM")}).$input
+ .change(function() {
+ make_tree();
+ });
+
+ page.set_secondary_action(__('Refresh'), function() {
+ make_tree();
+ });
+}
+
+
+frappe.pages['bom-browser'].on_page_show = function(wrapper){
+ // set from route
+ var bom = null;
+ if(frappe.get_route()[1]) {
+ var bom = frappe.get_route().splice(1).join("/");
+ }
+ if(frappe.route_options && frappe.route_options.bom) {
+ var bom = frappe.route_options.bom;
+ }
+ if(bom) {
+ wrapper.page.$bom_select.val(bom).trigger("change");
+ }
+};
+
+erpnext.BOMTree = Class.extend({
+ init: function(root, page, parent) {
+ $(parent).empty();
+ var me = this;
+ me.page = page;
+ me.bom = page.$bom_select.val();
+ me.can_read = frappe.model.can_read("BOM");
+ me.can_create = frappe.boot.user.can_create.indexOf("BOM") !== -1 ||
+ frappe.boot.user.in_create.indexOf("BOM") !== -1;
+ me.can_write = frappe.model.can_write("BOM");
+ me.can_delete = frappe.model.can_delete("BOM");
+
+ this.tree = new frappe.ui.Tree({
+ parent: $(parent),
+ label: me.bom,
+ args: {parent: me.bom},
+ method: 'erpnext.manufacturing.page.bom_browser.bom_browser.get_children',
+ toolbar: [
+ {toggle_btn: true},
+ {
+ label:__("Edit"),
+ condition: function(node) {
+ return node.expandable;
+ },
+ click: function(node) {
+ frappe.set_route("Form", "BOM", node.data.parent);
+ }
+ }
+ ],
+ get_label: function(node) {
+ if(node.data.qty) {
+ return node.data.qty + " x " + node.data.value;
+ } else {
+ return node.data.value;
+ }
+ }
+ });
+ }
+});
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.json b/erpnext/manufacturing/page/bom_browser/bom_browser.json
new file mode 100644
index 0000000..5b75463
--- /dev/null
+++ b/erpnext/manufacturing/page/bom_browser/bom_browser.json
@@ -0,0 +1,21 @@
+{
+ "content": null,
+ "creation": "2015-05-25 02:57:33.472044",
+ "docstatus": 0,
+ "doctype": "Page",
+ "modified": "2015-05-25 02:57:33.472044",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "bom-browser",
+ "owner": "Administrator",
+ "page_name": "bom-browser",
+ "roles": [
+ {
+ "role": "Manufacturing User"
+ }
+ ],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "title": "BOM Browser"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.py b/erpnext/manufacturing/page/bom_browser/bom_browser.py
new file mode 100644
index 0000000..8051e69
--- /dev/null
+++ b/erpnext/manufacturing/page/bom_browser/bom_browser.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+@frappe.whitelist()
+def get_children(parent):
+ return frappe.db.sql("""select item_code as value,
+ bom_no as parent, qty,
+ if(ifnull(bom_no, "")!="", 1, 0) as expandable
+ from `tabBOM Item`
+ where parent=%s
+ order by idx
+ """, parent, as_dict=True)
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 185a915..269dcba 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -100,6 +100,7 @@
execute:frappe.reload_doc('crm', 'doctype', 'lead')
execute:frappe.reload_doc('crm', 'doctype', 'opportunity')
erpnext.patches.v5_0.rename_taxes_and_charges_master
+erpnext.patches.v5_1.sales_bom_rename
erpnext.patches.v5_0.rename_table_fieldnames
execute:frappe.db.sql("update `tabJournal Entry` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
erpnext.patches.v5_0.is_group
@@ -155,3 +156,24 @@
erpnext.patches.v5_0.repost_requested_qty
erpnext.patches.v5_0.fix_taxes_and_totals_in_party_currency
erpnext.patches.v5_0.update_tax_amount_after_discount_in_purchase_cycle
+erpnext.patches.v5_0.rename_pos_setting
+erpnext.patches.v5_0.update_operation_description
+erpnext.patches.v5_0.set_footer_address
+execute:frappe.db.set_value("Backup Manager", None, "send_backups_to_dropbox", 1 if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox") in ("Daily", "Weekly") else 0)
+execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
+erpnext.patches.v5_0.update_item_and_description_again
+erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
+erpnext.patches.v5_0.portal_fixes
+erpnext.patches.v5_0.reset_values_in_tools
+execute:frappe.delete_doc("Page", "users")
+erpnext.patches.v5_0.update_material_transferred_for_manufacturing_again
+erpnext.patches.v5_0.index_on_account_and_gl_entry
+execute:frappe.db.sql("""delete from `tabProject Task`""")
+erpnext.patches.v5_0.item_variants
+erpnext.patches.v5_0.update_item_desc_in_invoice
+erpnext.patches.v5_1.fix_against_account
+erpnext.patches.v5_1.fix_credit_days_based_on
+erpnext.patches.v5_1.track_operations
+execute:frappe.rename_doc("DocType", "Salary Manager", "Process Payroll", force=True)
+erpnext.patches.v5_1.rename_roles
+erpnext.patches.v5_1.default_bom
diff --git a/erpnext/patches/v4_2/party_model.py b/erpnext/patches/v4_2/party_model.py
index cbb00cf..8f4fc33 100644
--- a/erpnext/patches/v4_2/party_model.py
+++ b/erpnext/patches/v4_2/party_model.py
@@ -19,20 +19,21 @@
receivable_payable_accounts = frappe._dict()
def _create_account(args):
- account_id = frappe.db.get_value("Account",
- {"account_name": args["account_name"], "company": args["company"]})
- if not account_id:
- account = frappe.new_doc("Account")
- account.is_group = 0
- account.update(args)
- account.insert()
+ if args["parent_account"] and frappe.db.exists("Account", args["parent_account"]):
+ account_id = frappe.db.get_value("Account",
+ {"account_name": args["account_name"], "company": args["company"]})
+ if not account_id:
+ account = frappe.new_doc("Account")
+ account.is_group = 0
+ account.update(args)
+ account.insert()
- account_id = account.name
+ account_id = account.name
frappe.db.set_value("Company", args["company"], ("default_receivable_account"
if args["account_type"]=="Receivable" else "default_payable_account"), account_id)
- receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)
+ receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)
for company in frappe.db.sql_list("select name from tabCompany"):
_create_account({
diff --git a/erpnext/patches/v5_0/index_on_account_and_gl_entry.py b/erpnext/patches/v5_0/index_on_account_and_gl_entry.py
new file mode 100644
index 0000000..16e43d6
--- /dev/null
+++ b/erpnext/patches/v5_0/index_on_account_and_gl_entry.py
@@ -0,0 +1,30 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ index_map = {
+ "Account": ["parent_account", "lft", "rgt"],
+ "GL Entry": ["posting_date", "account", 'party', "voucher_no"],
+ "Sales Invoice": ["posting_date", "debit_to", "customer"],
+ "Purchase Invoice": ["posting_date", "credit_to", "supplier"]
+ }
+
+ for dt, indexes in index_map.items():
+ existing_indexes = [(d.Key_name, d.Column_name) for d in frappe.db.sql("""show index from `tab{0}`
+ where Column_name != 'name'""".format(dt), as_dict=1)]
+
+ for old, column in existing_indexes:
+ if column in ("parent", "group_or_ledger", "is_group", "is_pl_account", "debit_or_credit",
+ "account_name", "company", "project_name", "voucher_date", "due_date", "bill_no",
+ "bill_date", "is_opening", "fiscal_year", "outstanding_amount"):
+ frappe.db.sql("alter table `tab{0}` drop index {1}".format(dt, old))
+
+ existing_indexes = [(d.Key_name, d.Column_name) for d in frappe.db.sql("""show index from `tab{0}`
+ where Column_name != 'name'""".format(dt), as_dict=1)]
+
+ existing_indexed_columns = list(set([x[1] for x in existing_indexes]))
+
+ for new in indexes:
+ if new not in existing_indexed_columns:
+ frappe.db.sql("alter table `tab{0}` add index ({1})".format(dt, new))
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/item_variants.py b/erpnext/patches/v5_0/item_variants.py
new file mode 100644
index 0000000..66300be
--- /dev/null
+++ b/erpnext/patches/v5_0/item_variants.py
@@ -0,0 +1,19 @@
+import frappe
+
+def execute():
+ frappe.reload_doctype("Item")
+ for dt in ["manage_variants", "manage_variants_item", "variant_attribute"]:
+ frappe.reload_doc("stock", "doctype", dt)
+
+ for d in frappe.get_list("Item", filters={"has_variants":1}):
+ manage_variant = frappe.new_doc("Manage Variants")
+ manage_variant.item_code = d.name
+ manage_variant.attributes = frappe.db.sql("select item_attribute as attribute, item_attribute_value as attribute_value \
+ from `tabItem Variant` where parent = %s", d.name, as_dict=1)
+ if manage_variant.attributes:
+ if not frappe.get_list("Item", filters={"variant_of": d.name}, limit_page_length=1):
+ frappe.db.sql("delete from `tabItem Variant` where parent=%s", d.name)
+ else:
+ manage_variant.generate_combinations()
+ manage_variant.create_variants()
+ frappe.delete_doc("DocType", "Item Variant")
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/portal_fixes.py b/erpnext/patches/v5_0/portal_fixes.py
new file mode 100644
index 0000000..d808692
--- /dev/null
+++ b/erpnext/patches/v5_0/portal_fixes.py
@@ -0,0 +1,6 @@
+import frappe
+import erpnext.setup.install
+
+def execute():
+ frappe.reload_doc("website", "doctype", "web_form_field", force=True)
+ erpnext.setup.install.add_web_forms()
diff --git a/erpnext/patches/v5_0/rename_pos_setting.py b/erpnext/patches/v5_0/rename_pos_setting.py
new file mode 100644
index 0000000..ad579b6
--- /dev/null
+++ b/erpnext/patches/v5_0/rename_pos_setting.py
@@ -0,0 +1,5 @@
+import frappe
+
+def execute():
+ if frappe.db.table_exists("POS Setting"):
+ frappe.rename_doc("DocType", "POS Setting", "POS Profile")
diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py
index 758280f..c26accbf 100644
--- a/erpnext/patches/v5_0/rename_table_fieldnames.py
+++ b/erpnext/patches/v5_0/rename_table_fieldnames.py
@@ -111,7 +111,6 @@
["installed_item_details", "items"]
],
"Item": [
- ["item_variants", "variants"],
["item_reorder", "reorder_levels"],
["uom_conversion_details", "uoms"],
["item_supplier_details", "supplier_items"],
@@ -168,7 +167,7 @@
["earning_details", "earnings"],
["deduction_details", "deductions"]
],
- "Sales BOM": [
+ "Product Bundle": [
["sales_bom_items", "items"]
],
"SMS Settings": [
diff --git a/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py b/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py
index 31747b8..ef3f1d6 100644
--- a/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py
+++ b/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py
@@ -9,13 +9,13 @@
# NOTE: sequence is important
renamed_fields = get_all_renamed_fields()
- for dt, script_field in (("Custom Script", "script"), ("Print Format", "html")):
+ for dt, script_field, ref_dt_field in (("Custom Script", "script", "dt"), ("Print Format", "html", "doc_type")):
cond1 = " or ".join("""{0} like "%%{1}%%" """.format(script_field, d[0].replace("_", "\\_")) for d in renamed_fields)
cond2 = " and standard = 'No'" if dt == "Print Format" else ""
- for name, script in frappe.db.sql("select name, {0} as script from `tab{1}` where ({2}) {3}".format(script_field, dt, cond1, cond2)):
- update_script(dt, name, script_field, script, renamed_fields)
+ for name, script, ref_dt in frappe.db.sql("select name, {0} as script, {1} as ref_dt from `tab{2}` where ({3}) {4}".format(script_field, ref_dt_field, dt, cond1, cond2)):
+ update_script(dt, name, ref_dt, script_field, script, renamed_fields)
def get_all_renamed_fields():
from erpnext.patches.v5_0.rename_table_fieldnames import rename_map
@@ -46,20 +46,20 @@
)
for fields in rename_map.values():
- if fields[0] != "entries":
- renamed_fields += tuple(fields)
-
+ renamed_fields += tuple(fields)
+
return renamed_fields
-def update_script(dt, name, script_field, script, renamed_fields):
+def update_script(dt, name, ref_dt, script_field, script, renamed_fields):
for from_field, to_field in renamed_fields:
- script = re.sub(r"\b{}\b".format(from_field), to_field, script)
-
- if dt == "Journal Entry":
+ if from_field != "entries":
+ script = re.sub(r"\b{}\b".format(from_field), to_field, script)
+
+ if ref_dt == "Journal Entry":
script = re.sub(r"\bentries\b", "accounts", script)
- elif dt == "Bank Reconciliation":
+ elif ref_dt == "Bank Reconciliation":
script = re.sub(r"\bentries\b", "journal_entries", script)
- elif dt in ("Sales Invoice", "Purchase Invoice"):
+ elif ref_dt in ("Sales Invoice", "Purchase Invoice"):
script = re.sub(r"\bentries\b", "items", script)
- frappe.db.set_value(dt, name, script_field, script)
+ frappe.db.set_value(dt, name, script_field, script)
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py b/erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py
new file mode 100644
index 0000000..da58ae2
--- /dev/null
+++ b/erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py
@@ -0,0 +1,26 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ je_list = frappe.db.sql_list("""
+ select par.name from `tabJournal Entry` par
+ where par.docstatus=1 and par.creation > '2015-03-01'
+ and (select count(distinct child.party) from `tabJournal Entry Account` child
+ where par.name=child.parent and ifnull(child.party, '') != '') > 1
+ """)
+
+ for d in je_list:
+ # delete existing gle
+ frappe.db.sql("delete from `tabGL Entry` where voucher_type='Journal Entry' and voucher_no=%s", d)
+
+ # repost gl entries
+ je = frappe.get_doc("Journal Entry", d)
+ je.make_gl_entries()
+
+ if je_list:
+ print je_list
+
+
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/reset_values_in_tools.py b/erpnext/patches/v5_0/reset_values_in_tools.py
new file mode 100644
index 0000000..2825e4f
--- /dev/null
+++ b/erpnext/patches/v5_0/reset_values_in_tools.py
@@ -0,0 +1,11 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ for dt in ["Payment Tool", "Bank Reconciliation", "Payment Reconciliation", "Leave Control Panel",
+ "Salary Manager", "Upload Attenadance", "Production Planning Tool", "BOM Replace Tool"]:
+ frappe.db.sql("delete from `tabSingles` where doctype=%s", dt)
+
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/set_footer_address.py b/erpnext/patches/v5_0/set_footer_address.py
new file mode 100644
index 0000000..a3324a0
--- /dev/null
+++ b/erpnext/patches/v5_0/set_footer_address.py
@@ -0,0 +1,8 @@
+import frappe
+
+def execute():
+ frappe.reload_doctype("System Settings")
+ ss = frappe.get_doc("System Settings", "System Settings")
+ ss.email_footer_address = frappe.db.get_default("company")
+ ss.flags.ignore_mandatory = True
+ ss.save()
diff --git a/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py b/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py
index 2f85513..14426f5 100644
--- a/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py
+++ b/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py
@@ -7,6 +7,6 @@
account_settings = frappe.get_doc("Accounts Settings")
if not account_settings.frozen_accounts_modifier and account_settings.bde_auth_role:
- frappe.db.set_value("Account Settings", None,
+ frappe.db.set_value("Accounts Settings", None,
"frozen_accounts_modifier", account_settings.bde_auth_role)
diff --git a/erpnext/patches/v5_0/update_item_and_description_again.py b/erpnext/patches/v5_0/update_item_and_description_again.py
new file mode 100644
index 0000000..6222748
--- /dev/null
+++ b/erpnext/patches/v5_0/update_item_and_description_again.py
@@ -0,0 +1,49 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+from frappe.utils import cstr
+import re
+
+def execute():
+ item_details = frappe._dict()
+ for d in frappe.db.sql("select name, description from `tabItem`", as_dict=1):
+ description = cstr(d.description).strip()
+ new_desc = extract_description(description)
+
+ item_details.setdefault(d.name, frappe._dict({
+ "old_description": description,
+ "new_description": new_desc
+ }))
+
+
+ dt_list= ["Purchase Order Item","Supplier Quotation Item", "BOM", "BOM Explosion Item" , \
+ "BOM Item", "Opportunity Item" , "Quotation Item" , "Sales Order Item" , "Delivery Note Item" , \
+ "Material Request Item" , "Purchase Receipt Item" , "Stock Entry Detail"]
+ for dt in dt_list:
+ frappe.reload_doctype(dt)
+ records = frappe.db.sql("""select name, `{0}` as item_code, description from `tab{1}`
+ where description is not null and description like '%%<table%%'"""
+ .format("item" if dt=="BOM" else "item_code", dt), as_dict=1)
+
+ count = 1
+ for d in records:
+ if d.item_code and item_details.get(d.item_code) \
+ and cstr(d.description) == item_details.get(d.item_code).old_description:
+ desc = item_details.get(d.item_code).new_description
+ else:
+ desc = extract_description(cstr(d.description))
+
+ frappe.db.sql("""update `tab{0}` set description = %s
+ where name = %s """.format(dt), (desc, d.name))
+
+ count += 1
+ if count % 500 == 0:
+ frappe.db.commit()
+
+
+def extract_description(desc):
+ for tag in ("img", "table", "tr", "td"):
+ desc = re.sub("\</*{0}[^>]*\>".format(tag), "", desc)
+
+ return desc
diff --git a/erpnext/patches/v5_0/update_item_desc_in_invoice.py b/erpnext/patches/v5_0/update_item_desc_in_invoice.py
new file mode 100644
index 0000000..1f74184
--- /dev/null
+++ b/erpnext/patches/v5_0/update_item_desc_in_invoice.py
@@ -0,0 +1,51 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+from frappe.website.utils import find_first_image
+from frappe.utils import cstr
+import re
+
+def execute():
+ item_details = frappe._dict()
+ for d in frappe.db.sql("select name, description, image from `tabItem`", as_dict=1):
+ description = cstr(d.description).strip()
+ item_details.setdefault(d.name, frappe._dict({
+ "description": description,
+ "image": d.image
+ }))
+
+
+ dt_list= ["Sales Invoice Item","Purchase Invoice Item"]
+ for dt in dt_list:
+ frappe.reload_doctype(dt)
+ records = frappe.db.sql("""select name, item_code, description from `tab{0}`
+ where ifnull(item_code, '') != '' and description is not null """.format(dt), as_dict=1)
+
+ count = 1
+ for d in records:
+ if item_details.get(d.item_code) and cstr(d.description) == item_details.get(d.item_code).description:
+ desc = item_details.get(d.item_code).description
+ image = item_details.get(d.item_code).image
+ else:
+ desc, image = extract_image_and_description(cstr(d.description))
+
+ if not image:
+ item_detail = item_details.get(d.item_code)
+ if item_detail:
+ image = item_detail.image
+
+ frappe.db.sql("""update `tab{0}` set description = %s, image = %s
+ where name = %s """.format(dt), (desc, image, d.name))
+
+ count += 1
+ if count % 500 == 0:
+ frappe.db.commit()
+
+
+def extract_image_and_description(data):
+ image_url = find_first_image(data)
+ desc = data
+ for tag in ("img", "table", "tr", "td"):
+ desc = re.sub("\</*{0}[^>]*\>".format(tag), "", desc)
+ return desc, image_url
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/update_item_description_and_image.py b/erpnext/patches/v5_0/update_item_description_and_image.py
index 6b47052..a18df2f 100644
--- a/erpnext/patches/v5_0/update_item_description_and_image.py
+++ b/erpnext/patches/v5_0/update_item_description_and_image.py
@@ -11,23 +11,23 @@
for d in frappe.db.sql("select name, description_html, description from `tabItem`", as_dict=1):
description = cstr(d.description_html).strip() or cstr(d.description).strip()
image_url, new_desc = extract_image_and_description(description)
-
+
item_details.setdefault(d.name, frappe._dict({
"old_description": description,
"new_description": new_desc,
"image_url": image_url
}))
-
-
+
+
dt_list= ["Purchase Order Item","Supplier Quotation Item", "BOM", "BOM Explosion Item" , \
"BOM Item", "Opportunity Item" , "Quotation Item" , "Sales Order Item" , "Delivery Note Item" , \
"Material Request Item" , "Purchase Receipt Item" , "Stock Entry Detail"]
for dt in dt_list:
frappe.reload_doctype(dt)
- records = frappe.db.sql("""select name, `{0}` as item_code, description from `tab{1}`
+ records = frappe.db.sql("""select name, `{0}` as item_code, description from `tab{1}`
where description is not null and image is null and description like '%%<img%%'"""
.format("item" if dt=="BOM" else "item_code", dt), as_dict=1)
-
+
count = 1
for d in records:
if d.item_code and item_details.get(d.item_code) \
@@ -40,7 +40,7 @@
if image_url:
frappe.db.sql("""update `tab{0}` set description = %s, image = %s
where name = %s """.format(dt), (desc, image_url, d.name))
-
+
count += 1
if count % 500 == 0:
frappe.db.commit()
@@ -49,5 +49,5 @@
def extract_image_and_description(data):
image_url = find_first_image(data)
desc = re.sub("\<img[^>]+\>", "", data)
-
- return image_url, desc
\ No newline at end of file
+
+ return image_url, desc
diff --git a/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py b/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py
new file mode 100644
index 0000000..a74b4bd
--- /dev/null
+++ b/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py
@@ -0,0 +1,18 @@
+import frappe
+
+def execute():
+ pro_order_qty_transferred = frappe._dict()
+ for se in frappe.db.sql("""select production_order, sum(fg_completed_qty) as transferred_qty
+ from `tabStock Entry`
+ where docstatus=1 and ifnull(production_order, '') != ''
+ and purpose = 'Material Transfer for Manufacture'
+ group by production_order""", as_dict=1):
+ pro_order_qty_transferred.setdefault(se.production_order, se.transferred_qty)
+
+ for d in frappe.get_all("Production Order", filters={"docstatus": 1}, fields=["name", "qty"]):
+ if d.name in pro_order_qty_transferred:
+ material_transferred_for_manufacturing = pro_order_qty_transferred.get(d.name) \
+ if pro_order_qty_transferred.get(d.name) <= d.qty else d.qty
+
+ frappe.db.sql("""update `tabProduction Order` set material_transferred_for_manufacturing=%s
+ where name=%s""", (material_transferred_for_manufacturing, d.name))
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/update_operation_description.py b/erpnext/patches/v5_0/update_operation_description.py
new file mode 100644
index 0000000..ae7b632
--- /dev/null
+++ b/erpnext/patches/v5_0/update_operation_description.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+import frappe.permissions
+
+def execute():
+ if "opn_description" in frappe.db.get_table_columns("BOM Operation"):
+ frappe.db.sql("""update `tabBOM Operation` set description = opn_description
+ where ifnull(description, '') = ''""")
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/update_projects.py b/erpnext/patches/v5_0/update_projects.py
index 71a84a1..e234246 100644
--- a/erpnext/patches/v5_0/update_projects.py
+++ b/erpnext/patches/v5_0/update_projects.py
@@ -10,13 +10,15 @@
for m in frappe.get_all("Project Milestone", "*"):
if (m.milestone and m.milestone_date
and frappe.db.exists("Project", m.parent)):
- frappe.get_doc({
+ task = frappe.get_doc({
"doctype": "Task",
"subject": m.milestone,
"expected_start_date": m.milestone_date,
"status": "Open" if m.status=="Pending" else "Closed",
"project": m.parent,
- }).insert(ignore_permissions=True)
+ })
+ task.flags.ignore_mandatory = True
+ task.insert(ignore_permissions=True)
# remove project milestone
frappe.delete_doc("DocType", "Project Milestone")
diff --git a/erpnext/patches/v5_1/__init__.py b/erpnext/patches/v5_1/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/patches/v5_1/__init__.py
diff --git a/erpnext/patches/v5_1/default_bom.py b/erpnext/patches/v5_1/default_bom.py
new file mode 100644
index 0000000..6484edd
--- /dev/null
+++ b/erpnext/patches/v5_1/default_bom.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ frappe.db.sql("""Update `tabItem` as item set default_bom = NULL where
+ not exists(select name from `tabBOM` as bom where item.default_bom = bom.name and bom.docstatus =1 )""")
\ No newline at end of file
diff --git a/erpnext/patches/v5_1/fix_against_account.py b/erpnext/patches/v5_1/fix_against_account.py
new file mode 100644
index 0000000..a62c15b
--- /dev/null
+++ b/erpnext/patches/v5_1/fix_against_account.py
@@ -0,0 +1,37 @@
+from __future__ import unicode_literals
+
+import frappe
+
+from erpnext.accounts.doctype.gl_entry.gl_entry import update_against_account
+
+def execute():
+ from_date = "2015-05-01"
+
+ for doc in frappe.get_all("Journal Entry",
+ filters={"creation": (">", from_date), "docstatus": "1"}):
+
+ # update in gl_entry
+ update_against_account("Journal Entry", doc.name)
+
+ # update in jv
+ doc = frappe.get_doc("Journal Entry", doc.name)
+ doc.set_against_account()
+ doc.db_update()
+
+ for doc in frappe.get_all("Sales Invoice",
+ filters={"creation": (">", from_date), "docstatus": "1"},
+ fields=["name", "customer"]):
+
+ frappe.db.sql("""update `tabGL Entry` set against=%s
+ where voucher_type='Sales Invoice' and voucher_no=%s
+ and credit > 0 and ifnull(party, '')=''""",
+ (doc.customer, doc.name))
+
+ for doc in frappe.get_all("Purchase Invoice",
+ filters={"creation": (">", from_date), "docstatus": "1"},
+ fields=["name", "supplier"]):
+
+ frappe.db.sql("""update `tabGL Entry` set against=%s
+ where voucher_type='Purchase Invoice' and voucher_no=%s
+ and debit > 0 and ifnull(party, '')=''""",
+ (doc.supplier, doc.name))
diff --git a/erpnext/patches/v5_1/fix_credit_days_based_on.py b/erpnext/patches/v5_1/fix_credit_days_based_on.py
new file mode 100644
index 0000000..6df19f2
--- /dev/null
+++ b/erpnext/patches/v5_1/fix_credit_days_based_on.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ for dt in ("Customer", "Customer Group", "Company"):
+ frappe.reload_doctype(dt, force=True)
+ frappe.db.sql("""update `tab{0}` set credit_days_based_on='Fixed Days'
+ where ifnull(credit_days, 0) > 0""".format(dt))
diff --git a/erpnext/patches/v5_1/rename_roles.py b/erpnext/patches/v5_1/rename_roles.py
new file mode 100644
index 0000000..452c800
--- /dev/null
+++ b/erpnext/patches/v5_1/rename_roles.py
@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+ if not frappe.db.exists("Role", "Stock User"):
+ frappe.rename_doc("Role", "Material User", "Stock User")
+ if not frappe.db.exists("Role", "Stock Manager"):
+ frappe.rename_doc("Role", "Material Manager", "Stock Manager")
+ if not frappe.db.exists("Role", "Stock Manager"):
+ frappe.rename_doc("Role", "Material Master Manager", "Item Manager")
diff --git a/erpnext/patches/v5_1/sales_bom_rename.py b/erpnext/patches/v5_1/sales_bom_rename.py
new file mode 100644
index 0000000..e06012f
--- /dev/null
+++ b/erpnext/patches/v5_1/sales_bom_rename.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ tables = frappe.db.sql_list("show tables")
+ for old_dt, new_dt in [["Sales BOM Item", "Product Bundle Item"],
+ ["Sales BOM", "Product Bundle"]]:
+ if "tab"+new_dt not in tables:
+ frappe.rename_doc("DocType", old_dt, new_dt, force=True)
diff --git a/erpnext/patches/v5_1/track_operations.py b/erpnext/patches/v5_1/track_operations.py
new file mode 100644
index 0000000..0a12142
--- /dev/null
+++ b/erpnext/patches/v5_1/track_operations.py
@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ frappe.reload_doctype("Production Order")
+ frappe.db.sql("""Update `tabProduction Order` as po set track_operations=1 where
+ exists(select name from `tabProduction Order Operation` as po_operation where po_operation.parent = po.name )""")
\ No newline at end of file
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.js b/erpnext/projects/doctype/activity_cost/activity_cost.js
new file mode 100644
index 0000000..ba10153
--- /dev/null
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.js
@@ -0,0 +1 @@
+cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
\ No newline at end of file
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json
index 7f7720a..fafea58 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 1,
- "autoname": "Activity Cost - .#",
+ "autoname": "AC-.#####",
"creation": "2015-03-23 02:00:21.861546",
"custom": 0,
"docstatus": 0,
@@ -11,40 +11,6 @@
"fields": [
{
"allow_on_submit": 0,
- "fieldname": "employee",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Employee",
- "no_copy": 0,
- "options": "Employee",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0
- },
- {
- "fieldname": "employee_name",
- "fieldtype": "Read Only",
- "label": "Employee Name",
- "options": "employee.employee_name",
- "permlevel": 0,
- "precision": ""
- },
- {
- "fieldname": "column_break_2",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "precision": ""
- },
- {
- "allow_on_submit": 0,
"fieldname": "activity_type",
"fieldtype": "Link",
"hidden": 0,
@@ -64,6 +30,41 @@
"set_only_once": 0
},
{
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "allow_on_submit": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Employee",
+ "no_copy": 0,
+ "options": "Employee",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0
+ },
+ {
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "label": "Employee Name",
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "read_only": 1
+ },
+ {
"fieldname": "section_break_4",
"fieldtype": "Section Break",
"permlevel": 0,
@@ -135,7 +136,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 0,
- "modified": "2015-04-14 02:08:33.690406",
+ "modified": "2015-06-16 03:12:25.644839",
"modified_by": "Administrator",
"module": "Projects",
"name": "Activity Cost",
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.py b/erpnext/projects/doctype/activity_cost/activity_cost.py
index 121e650..862a707 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.py
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.py
@@ -15,10 +15,21 @@
self.check_unique()
def set_title(self):
- self.title = _("{0} for {1}").format(self.employee_name, self.activity_type)
-
+ if self.employee:
+ if not self.employee_name:
+ self.employee_name = frappe.db.get_value("Employee", self.employee, "employee_name")
+ self.title = _("{0} for {1}").format(self.employee_name, self.activity_type)
+ else:
+ self.title = self.activity_type
+
def check_unique(self):
- if frappe.db.sql("""select name from `tabActivity Cost` where employee_name= %s and activity_type= %s and name != %s""",
- (self.employee_name, self.activity_type, self.name)):
- frappe.throw(_("Activity Cost exists for Employee {0} against Activity Type - {1}")
- .format(self.employee, self.activity_type), DuplicationError)
+ if self.employee:
+ if frappe.db.sql("""select name from `tabActivity Cost` where employee_name= %s and activity_type= %s and name != %s""",
+ (self.employee_name, self.activity_type, self.name)):
+ frappe.throw(_("Activity Cost exists for Employee {0} against Activity Type - {1}")
+ .format(self.employee, self.activity_type), DuplicationError)
+ else:
+ if frappe.db.sql("""select name from `tabActivity Cost` where ifnull(employee, '')='' and activity_type= %s and name != %s""",
+ (self.activity_type, self.name)):
+ frappe.throw(_("Default Activity Cost exists for Activity Type - {0}")
+ .format(self.activity_type), DuplicationError)
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index aa55876..8999f85 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -26,22 +26,29 @@
// show tasks
cur_frm.cscript.refresh = function(doc) {
if(!doc.__islocal) {
- cur_frm.add_custom_button(__("Gantt Chart"), function() {
- frappe.route_options = {"project": doc.name, "start": doc.expected_start_date, "end": doc.expected_end_date};
- frappe.set_route("Gantt", "Task");
- }, "icon-tasks", true);
- cur_frm.add_custom_button(__("Tasks"), function() {
- frappe.route_options = {"project": doc.name}
- frappe.set_route("List", "Task");
- }, "icon-list", true);
- cur_frm.add_custom_button(__("Time Logs"), function() {
- frappe.route_options = {"project": doc.name}
- frappe.set_route("List", "Time Log");
- }, "icon-list", true);
- cur_frm.add_custom_button(__("Expense Claims"), function() {
- frappe.route_options = {"project": doc.name}
- frappe.set_route("List", "Expense Claim");
- }, "icon-list", true);
+ if(frappe.model.can_read("Task")) {
+ cur_frm.add_custom_button(__("Gantt Chart"), function() {
+ frappe.route_options = {"project": doc.name, "start": doc.expected_start_date, "end": doc.expected_end_date};
+ frappe.set_route("Gantt", "Task");
+ }, "icon-tasks", true);
+ cur_frm.add_custom_button(__("Tasks"), function() {
+ frappe.route_options = {"project": doc.name}
+ frappe.set_route("List", "Task");
+ }, "icon-list", true);
+ }
+ if(frappe.model.can_read("Time Log")) {
+ cur_frm.add_custom_button(__("Time Logs"), function() {
+ frappe.route_options = {"project": doc.name}
+ frappe.set_route("List", "Time Log");
+ }, "icon-list", true);
+ }
+
+ if(frappe.model.can_read("Expense Claim")) {
+ cur_frm.add_custom_button(__("Expense Claims"), function() {
+ frappe.route_options = {"project": doc.name}
+ frappe.set_route("List", "Expense Claim");
+ }, "icon-list", true);
+ }
}
}
@@ -56,5 +63,5 @@
filters:{
'project_name': doc.name
}
- }
+ }
}
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 2aca991..486d861 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -163,6 +163,7 @@
"fieldtype": "Percent",
"in_list_view": 0,
"label": "% Tasks Completed",
+ "no_copy": 1,
"permlevel": 0,
"read_only": 1
},
@@ -356,7 +357,7 @@
"icon": "icon-puzzle-piece",
"idx": 1,
"max_attachments": 4,
- "modified": "2015-04-27 07:37:44.239930",
+ "modified": "2015-06-12 09:00:54.080220",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project",
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index c914f22..6ebafdb 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -15,19 +15,27 @@
def onload(self):
"""Load project tasks for quick view"""
- for task in frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc"):
- self.append("tasks", {
- "title": task.subject,
- "status": task.status,
- "start_date": task.exp_start_date,
- "end_date": task.exp_end_date,
- "description": task.description,
- "task_id": task.name
- })
-
+ if not self.get("tasks"):
+ for task in self.get_tasks():
+ self.append("tasks", {
+ "title": task.subject,
+ "status": task.status,
+ "start_date": task.exp_start_date,
+ "end_date": task.exp_end_date,
+ "description": task.description,
+ "task_id": task.name
+ })
+
+ def __setup__(self):
+ self.onload()
+
+ def get_tasks(self):
+ return frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc")
+
def validate(self):
self.validate_dates()
self.sync_tasks()
+ self.tasks = []
def validate_dates(self):
if self.expected_start_date and self.expected_end_date:
@@ -38,6 +46,8 @@
"""sync tasks and remove table"""
if self.flags.dont_sync_tasks: return
+
+ task_added_or_deleted = False
task_names = []
for t in self.tasks:
if t.task_id:
@@ -45,6 +55,7 @@
else:
task = frappe.new_doc("Task")
task.project = self.name
+ task_added_or_deleted = True
task.update({
"subject": t.title,
@@ -62,17 +73,22 @@
# delete
for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}):
frappe.delete_doc("Task", t.name)
+ task_added_or_deleted = True
+
+ if task_added_or_deleted:
+ self.update_project()
- self.tasks = []
+ def update_project(self):
+ self.update_percent_complete()
+ self.update_costing()
def update_percent_complete(self):
- total = frappe.db.sql("""select count(*) from tabTask where project=%s""",
- self.name)[0][0]
+ total = frappe.db.sql("""select count(*) from tabTask where project=%s""", self.name)[0][0]
if total:
completed = frappe.db.sql("""select count(*) from tabTask where
project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0]
- frappe.db.set_value("Project", self.name, "percent_complete",
- int(float(completed) / total * 100))
+
+ self.percent_complete = flt(completed) / total * 100
def update_costing(self):
total_cost = frappe.db.sql("""select sum(total_costing_amount) as costing_amount,
diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
index f69ce80..f1be544 100644
--- a/erpnext/projects/doctype/project/test_project.py
+++ b/erpnext/projects/doctype/project/test_project.py
@@ -5,3 +5,4 @@
import frappe
test_records = frappe.get_test_records('Project')
+test_ignore = ["Sales Order"]
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 456c40a..fcd756b 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -28,7 +28,8 @@
def validate(self):
self.validate_dates()
-
+ self.validate_status()
+
def validate_dates(self):
if self.exp_start_date and self.exp_end_date and getdate(self.exp_start_date) > getdate(self.exp_end_date):
frappe.throw(_("'Expected Start Date' can not be greater than 'Expected End Date'"))
@@ -36,22 +37,24 @@
if self.act_start_date and self.act_end_date and getdate(self.act_start_date) > getdate(self.act_end_date):
frappe.throw(_("'Actual Start Date' can not be greater than 'Actual End Date'"))
+ def validate_status(self):
+ if self.status!=self.get_db_value("status") and self.status == "Closed":
+ for d in self.depends_on:
+ if frappe.db.get_value("Task", d.task, "status") != "Closed":
+ frappe.throw(_("Cannot close task as its dependant task {0} is not closed.").format(d.task))
+
+ from frappe.desk.form.assign_to import clear
+ clear(self.doctype, self.name)
+
def on_update(self):
self.check_recursion()
self.reschedule_dependent_tasks()
- self.update_percentage()
self.update_project()
-
- def update_percentage(self):
- """update percent complete in project"""
- if self.project and not self.flags.from_project:
- project = frappe.get_doc("Project", self.project)
- project.run_method("update_percent_complete")
-
+
def update_total_expense_claim(self):
- self.total_expense_claim = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim`
+ self.total_expense_claim = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim`
where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.name))
-
+
def update_time_and_costing(self):
tl = frappe.db.sql("""select min(from_time) as start_date, max(to_time) as end_date,
sum(billing_amount) as total_billing_amount, sum(costing_amount) as total_costing_amount,
@@ -64,14 +67,14 @@
self.actual_time= tl.time
self.act_start_date= tl.start_date
self.act_end_date= tl.end_date
-
+
def update_project(self):
- if self.project and frappe.db.exists("Project", self.project):
+ if self.project and not self.flags.from_project:
project = frappe.get_doc("Project", self.project)
project.flags.dont_sync_tasks = True
- project.update_costing()
+ project.update_project()
project.save()
-
+
def check_recursion(self):
if self.flags.ignore_recursion_check: return
check_list = [['task', 'parent'], ['parent', 'task']]
@@ -88,7 +91,7 @@
task_list.append(b[0])
if count == 15:
break
-
+
def reschedule_dependent_tasks(self):
end_date = self.exp_end_date or self.act_end_date
if end_date:
@@ -137,7 +140,7 @@
%(mcond)s
order by name
limit %(start)s, %(page_len)s """ % {'key': searchfield,
- 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype),
+ 'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype),
'start': start, 'page_len': page_len})
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index 8880763..fced0a4 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -11,19 +11,19 @@
class TestTask(unittest.TestCase):
def test_circular_reference(self):
-
+
task1 = frappe.new_doc('Task')
task1.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 1",
"exp_start_date": "2015-1-1",
"exp_end_date": "2015-1-10"
})
task1.save()
-
+
task2 = frappe.new_doc('Task')
task2.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 2",
"exp_start_date": "2015-1-11",
"exp_end_date": "2015-1-15",
@@ -34,10 +34,10 @@
]
})
task2.save()
-
+
task3 = frappe.new_doc('Task')
task3.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 2",
"exp_start_date": "2015-1-11",
"exp_end_date": "2015-1-15",
@@ -53,13 +53,13 @@
"task": task3.name
})
self.assertRaises(CircularReferenceError, task1.save)
-
+
task1.set("depends_on", [])
task1.save()
-
+
task4 = frappe.new_doc('Task')
task4.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 1",
"exp_start_date": "2015-1-1",
"exp_end_date": "2015-1-15",
@@ -74,20 +74,20 @@
task3.append("depends_on", {
"task": task4.name
})
-
+
def test_reschedule_dependent_task(self):
task1 = frappe.new_doc('Task')
task1.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 1",
"exp_start_date": "2015-1-1",
"exp_end_date": "2015-1-10"
})
task1.save()
-
+
task2 = frappe.new_doc('Task')
task2.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 2",
"exp_start_date": "2015-1-11",
"exp_end_date": "2015-1-15",
@@ -98,10 +98,10 @@
]
})
task2.save()
-
+
task3 = frappe.new_doc('Task')
task3.update({
- "status": "Open",
+ "status": "Open",
"subject": "_Test Task 3",
"exp_start_date": "2015-1-16",
"exp_end_date": "2015-1-18",
@@ -112,18 +112,18 @@
]
})
task3.save()
-
+
task1.update({
"exp_end_date": "2015-1-20"
})
task1.save()
-
+
self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
+
time_log = frappe.new_doc('Time Log')
time_log.update({
"from_time": "2015-1-1",
@@ -131,18 +131,49 @@
"task": task1.name
})
time_log.submit()
-
+
self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
+
time_log.cancel()
-
+
self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
\ No newline at end of file
+
+
+ def test_close_assignment(self):
+ task = frappe.new_doc("Task")
+ task.subject = "Test Close Assignment"
+ task.insert()
+
+ def assign():
+ from frappe.desk.form import assign_to
+ assign_to.add({
+ "assign_to": "test@example.com",
+ "doctype": task.doctype,
+ "name": task.name,
+ "description": "Close this task"
+ })
+
+ def get_owner_and_status():
+ return frappe.db.get_value("ToDo", filters={"reference_type": task.doctype, "reference_name": task.name,
+ "description": "Close this task"}, fieldname=("owner", "status"), as_dict=True)
+
+ assign()
+ todo = get_owner_and_status()
+ self.assertEquals(todo.owner, "test@example.com")
+ self.assertEquals(todo.status, "Open")
+
+ # assignment should be
+ task.load_from_db()
+ task.status = "Closed"
+ task.save()
+ todo = get_owner_and_status()
+ self.assertEquals(todo.owner, "test@example.com")
+ self.assertEquals(todo.status, "Closed")
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index 536ddf8..776a75b 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -42,7 +42,7 @@
frappe.ui.form.on("Time Log", "to_time", function(frm) {
if(frm._setting_hours) return;
frm.set_value("hours", moment(cur_frm.doc.to_time).diff(moment(cur_frm.doc.from_time),
- "hours"));
+ "minutes") / 60);
});
@@ -98,5 +98,5 @@
filters:{
'project': doc.project
}
- }
+ }
}
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index f7b501d..136362b 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -73,18 +73,20 @@
def validate_overlap_for(self, fieldname):
existing = self.get_overlap_for(fieldname)
if existing:
- frappe.throw(_("This Time Log conflicts with {0} for {1}").format(existing.name,
- self.meta.get_label(fieldname)), OverlapError)
+ frappe.throw(_("This Time Log conflicts with {0} for {1} {2}").format(existing.name,
+ self.meta.get_label(fieldname), self.get(fieldname)), OverlapError)
def get_overlap_for(self, fieldname):
if not self.get(fieldname):
return
- existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log` where `{0}`=%(val)s and
+ existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log`
+ where `{0}`=%(val)s and
(
- (from_time between %(from_time)s and %(to_time)s) or
- (to_time between %(from_time)s and %(to_time)s) or
- (%(from_time)s between from_time and to_time))
+ (from_time > %(from_time)s and from_time < %(to_time)s) or
+ (to_time > %(from_time)s and to_time < %(to_time)s) or
+ (%(from_time)s > from_time and %(from_time)s < to_time) or
+ (%(from_time)s = from_time and %(to_time)s = to_time))
and name!=%(name)s
and ifnull(task, "")=%(task)s
and docstatus < 2""".format(fieldname),
@@ -128,7 +130,7 @@
def update_production_order(self):
"""Updates `start_date`, `end_date`, `status` for operation in Production Order."""
-
+
if self.production_order and self.for_manufacturing:
if not self.operation_id:
frappe.throw(_("Operation ID not set"))
@@ -195,8 +197,6 @@
if self.for_manufacturing:
if not self.production_order:
frappe.throw(_("Production Order is Mandatory"))
- if not self.operation:
- frappe.throw(_("Operation is Mandatory"))
if not self.completed_qty:
self.completed_qty = 0
@@ -210,22 +210,23 @@
self.production_order = None
self.operation = None
self.quantity = None
-
+
def update_cost(self):
rate = get_activity_cost(self.employee, self.activity_type)
if rate:
self.costing_rate = rate.get('costing_rate')
- self.billing_rate = rate.get('billing_rate')
+ self.billing_rate = rate.get('billing_rate')
self.costing_amount = self.costing_rate * self.hours
if self.billable:
self.billing_amount = self.billing_rate * self.hours
else:
self.billing_amount = 0
-
+
def validate_task(self):
- if self.project and not self.task:
+ # if a time log is being created against a project without production order
+ if (self.project and not self.production_order) and not self.task:
frappe.throw(_("Task is Mandatory if Time Log is against a project"))
-
+
def update_task(self):
if self.task and frappe.db.exists("Task", self.task):
task = frappe.get_doc("Task", self.task)
@@ -268,9 +269,12 @@
d.title += " for Project: " + d.project
return data
-
+
@frappe.whitelist()
def get_activity_cost(employee=None, activity_type=None):
rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee= %s
and activity_type= %s""", (employee, activity_type), as_dict=1)
+ if not rate:
+ rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where ifnull(employee, '')=''
+ and activity_type= %s""", (activity_type), as_dict=1)
return rate[0] if rate else {}
diff --git a/erpnext/projects/doctype/time_log/time_log_calendar.js b/erpnext/projects/doctype/time_log/time_log_calendar.js
index 3ed092a..61229d6 100644
--- a/erpnext/projects/doctype/time_log/time_log_calendar.js
+++ b/erpnext/projects/doctype/time_log/time_log_calendar.js
@@ -17,6 +17,12 @@
"options": "Workstation",
"label": __("Workstation")
},
+ {
+ "fieldtype": "Link",
+ "fieldname": "employee",
+ "options": "Employee",
+ "label": __("Employee")
+ },
],
get_events_method: "erpnext.projects.doctype.time_log.time_log.get_events"
-}
\ No newline at end of file
+}
diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index 7d02940..9b4df40 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -48,3 +48,9 @@
.product-text {
padding: 15px 0px;
}
+@media (max-width: 767px) {
+ .product-search {
+ width: 100%;
+ margin-bottom: 13px;
+ }
+}
diff --git a/erpnext/public/images/erpnext-fade.png b/erpnext/public/images/erpnext-fade.png
deleted file mode 100644
index 81cc410..0000000
--- a/erpnext/public/images/erpnext-fade.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/public/images/erpnext-footer.png b/erpnext/public/images/erpnext-footer.png
new file mode 100644
index 0000000..4b36fa1
--- /dev/null
+++ b/erpnext/public/images/erpnext-footer.png
Binary files differ
diff --git a/erpnext/public/images/erpnext-logo-white.svg b/erpnext/public/images/erpnext-logo-white.svg
deleted file mode 100644
index fb72c17..0000000
--- a/erpnext/public/images/erpnext-logo-white.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg2"
- version="1.1"
- viewBox="0 0 680 820"
- preserveAspectRatio="xMidyMid meet"
- width="100%"
- height="100%">
- <defs
- id="defs4" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- style="display:inline">
- <rect
- style="fill:#fff"
- id="rect3800"
- width="150"
- height="150"
- x="60.000008"
- y="-472.36218"
- rx="20"
- ry="20"
- transform="scale(1,-1)" />
- </g>
- <g
- id="layer2">
- <path
- transform="scale(1,-1)"
- style="display:inline;fill:#fff"
- d="m 180,-372.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
- id="rect3051"/>
- </g>
- <g
- id="layer3">
- <rect
- style="display:inline;fill:#fff"
- id="rect3840"
- width="150"
- height="150"
- x="260"
- y="-272.36218"
- rx="20"
- ry="20"
- transform="scale(1,-1)" />
- </g>
- <g
- id="layer4">
- <path
- id="path3054"
- d="m 490,372.36218 -110,0 -20,0 0,-20 0,-110 c 0,-11.08 8.92,-20 20,-20 l 110,0 c 11.08,0 20,8.92 20,20 l 0,110 c 0,11.08 -8.92,20 -20,20 z"
- style="display:inline;fill:#fff" />
- </g>
- <g
- id="layer5">
- <rect
- style="display:inline;fill:#fff"
- id="rect3844"
- width="150"
- height="150"
- x="460"
- y="-472.36218"
- rx="20"
- ry="20"
- transform="scale(1,-1)" />
- </g>
- <g
- id="layer6">
- <path
- style="display:inline;fill:#fff"
- d="m 490,422.36218 -110,0 -20,0 0,20 0,110 c 0,11.08 8.92,20 20,20 l 110,0 c 11.08,0 20,-8.92 20,-20 l 0,-110 c 0,-11.08 -8.92,-20 -20,-20 z"
- id="path3058" />
- </g>
- <g
- id="layer7">
- <rect
- style="display:inline;fill:#fff"
- id="rect3848"
- width="150"
- height="150"
- x="260"
- y="-672.36218"
- rx="20"
- ry="20"
- transform="scale(1,-1)" />
- </g>
- <g
- id="layer8">
- <path
- id="path3056"
- d="m 180,422.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
- style="display:inline;fill:#fff" />
- </g>
-</svg>
diff --git a/erpnext/public/images/erpnext1.png b/erpnext/public/images/erpnext1.png
deleted file mode 100644
index cfc3d84..0000000
--- a/erpnext/public/images/erpnext1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/public/images/feed.png b/erpnext/public/images/feed.png
deleted file mode 100755
index 315c4f4..0000000
--- a/erpnext/public/images/feed.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index d198ead..6264019 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -7,6 +7,10 @@
$(document).bind('toolbar_setup', function() {
frappe.app.name = "ERPNext";
+ frappe.help_feedback_link = '<p><a class="text-muted" \
+ href="https://discuss.erpnext.com">Feedback</a></p>'
+
+
$('.navbar-home').html('ERPNext');
$('[data-link="docs"]').attr("href", "https://manual.erpnext.com")
diff --git a/erpnext/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js
index 1d62b3a..c5cad95 100644
--- a/erpnext/public/js/controllers/stock_controller.js
+++ b/erpnext/public/js/controllers/stock_controller.js
@@ -70,16 +70,5 @@
frappe.set_route("query-report", "General Ledger");
}, "icon-table");
}
- },
-
- copy_account_in_all_row: function(doc, dt, dn, fieldname) {
- var d = locals[dt][dn];
- if(d[fieldname]){
- var cl = doc["items"] || [];
- for(var i = 0; i < cl.length; i++) {
- if(!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
- }
- }
- refresh_field("items");
}
});
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index a3f1eca..0a75dad 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -14,7 +14,6 @@
$.each({
posting_date: today,
- due_date: today,
transaction_date: today,
currency: currency,
price_list_currency: currency,
@@ -37,6 +36,16 @@
if(this.frm.fields_dict["items"]) {
this["items_remove"] = this.calculate_taxes_and_totals;
}
+
+ if(this.frm.fields_dict["recurring_print_format"]) {
+ this.frm.set_query("recurring_print_format", function(doc) {
+ return{
+ filters: [
+ ['Print Format', 'doc_type', '=', cur_frm.doctype],
+ ]
+ }
+ });
+ }
},
onload_post_render: function() {
@@ -66,18 +75,22 @@
apply_default_taxes: function() {
var me = this;
- return frappe.call({
- method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
- args: {
- "master_doctype": frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
- me.frm.doc.name).options
- },
- callback: function(r) {
- if(!r.exc) {
- me.frm.set_value("taxes", r.message);
+ var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
+ me.frm.doc.name);
+
+ if(taxes_and_charges_field) {
+ frappe.call({
+ method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
+ args: {
+ "master_doctype": taxes_and_charges_field.options
+ },
+ callback: function(r) {
+ if(!r.exc) {
+ me.frm.set_value("taxes", r.message);
+ }
}
- }
- });
+ });
+ }
},
setup_sms: function() {
@@ -94,13 +107,22 @@
},
hide_currency_and_price_list: function() {
- if(this.frm.doc.docstatus > 0) {
+ if(this.frm.doc.conversion_rate == 1 && this.frm.doc.docstatus > 0) {
hide_field("currency_and_price_list");
} else {
unhide_field("currency_and_price_list");
}
},
+ barcode: function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ if(d.barcode=="" || d.barcode==null) {
+ // barcode cleared, remove item
+ d.item_code = "";
+ }
+ this.item_code(doc, cdt, cdn);
+ },
+
item_code: function(doc, cdt, cdn) {
var me = this;
var item = frappe.get_doc(cdt, cdn);
@@ -205,9 +227,11 @@
me.frm.set_value('plc_conversion_rate', 1.0);
}
if (company_doc.default_letter_head) {
- me.frm.set_value("letter_head", company_doc.default_letter_head);
+ if(me.frm.fields_dict.letter_head) {
+ me.frm.set_value("letter_head", company_doc.default_letter_head);
+ }
}
- if (company_doc.default_terms) {
+ if (company_doc.default_terms && me.frm.doc.doctype != "Purchase Invoice") {
me.frm.set_value("tc_name", company_doc.default_terms);
}
@@ -230,12 +254,38 @@
},
posting_date: function() {
- erpnext.get_fiscal_year(this.frm.doc.company, this.frm.doc.posting_date);
+ var me = this;
+ if (this.frm.doc.posting_date) {
+ if ((this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.customer) ||
+ (this.frm.doc.doctype == "Purchase Invoice" && this.frm.doc.supplier)) {
+ return frappe.call({
+ method: "erpnext.accounts.party.get_due_date",
+ args: {
+ "posting_date": me.frm.doc.posting_date,
+ "party_type": me.frm.doc.doctype == "Sales Invoice" ? "Customer" : "Supplier",
+ "party": me.frm.doc.doctype == "Sales Invoice" ? me.frm.doc.customer : me.frm.doc.supplier,
+ "company": me.frm.doc.company
+ },
+ callback: function(r, rt) {
+ if(r.message) {
+ me.frm.set_value("due_date", r.message);
+ }
+ erpnext.get_fiscal_year(me.frm.doc.company, me.frm.doc.posting_date);
+ }
+ })
+ } else {
+ erpnext.get_fiscal_year(me.frm.doc.company, me.frm.doc.posting_date);
+ }
+ }
},
get_company_currency: function() {
return erpnext.get_currency(this.frm.doc.company);
},
+
+ contact_person: function() {
+ erpnext.utils.get_contact_details(this.frm);
+ },
currency: function() {
var me = this;
@@ -767,3 +817,5 @@
cur_frm.cscript.set_dynamic_labels();
cur_frm.cscript.calculate_taxes_and_totals();
})
+
+
diff --git a/erpnext/public/js/feature_setup.js b/erpnext/public/js/feature_setup.js
index 85f8e05..d43ffc5 100644
--- a/erpnext/public/js/feature_setup.js
+++ b/erpnext/public/js/feature_setup.js
@@ -46,7 +46,7 @@
'Purchase Invoice': {'items':['brand']},
'Quotation': {'items':['brand']},
'Sales Invoice': {'items':['brand']},
- 'Sales BOM': {'fields':['new_item_brand']},
+ 'Product Bundle': {'fields':['new_item_brand']},
'Sales Order': {'items':['brand']},
'Serial No': {'fields':['brand']}
},
@@ -81,7 +81,8 @@
'Item': {'fields': ['barcode']},
'Delivery Note': {'items': ['barcode']},
'Sales Invoice': {'items': ['barcode']},
- 'Stock Entry': {'items': ['barcode']}
+ 'Stock Entry': {'items': ['barcode']},
+ 'Purchase Receipt': {'items': ['barcode']}
},
'fs_item_group_in_details': {
'Delivery Note': {'items':['item_group']},
@@ -94,7 +95,7 @@
'Purchase Voucher': {'items':['item_group']},
'Quotation': {'items':['item_group']},
'Sales Invoice': {'items':['item_group']},
- 'Sales BOM': {'fields':['serial_no']},
+ 'Product Bundle': {'fields':['serial_no']},
'Sales Order': {'items':['item_group']},
'Serial No': {'fields':['item_group']},
'Sales Partner': {'targets':['item_group']},
@@ -117,7 +118,7 @@
'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
},
- 'POS Setting': {'fields':['conversion_rate','currency']},
+ 'POS Profile': {'fields':['conversion_rate','currency']},
'Quotation': {
'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
@@ -128,7 +129,7 @@
'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
},
- 'Sales BOM': {'fields':['currency']},
+ 'Product Bundle': {'fields':['currency']},
'Sales Order': {
'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js
index 46585f9..e28c718 100644
--- a/erpnext/public/js/pos/pos.js
+++ b/erpnext/public/js/pos/pos.js
@@ -331,7 +331,7 @@
},
set_primary_action: function() {
var me = this;
- if (!this.frm.pos_active) return;
+ if (this.frm.page.current_view_name==="main") return;
if (this.frm.doctype == "Sales Invoice" && this.frm.doc.docstatus===0) {
if (!this.frm.doc.is_pos) {
@@ -342,7 +342,6 @@
});
} else if (this.frm.doc.docstatus===1) {
this.frm.page.set_primary_action(__("New"), function() {
- me.frm.pos_active = false;
erpnext.open_as_pos = true;
new_doc(me.frm.doctype);
});
@@ -402,7 +401,8 @@
this.with_modes_of_payment(function() {
// prefer cash payment!
- var default_mode = me.modes_of_payment.indexOf(__("Cash"))!==-1 ? __("Cash") : undefined;
+ var default_mode = me.frm.doc.mode_of_payment ? me.frm.doc.mode_of_payment :
+ me.modes_of_payment.indexOf(__("Cash"))!==-1 ? __("Cash") : undefined;
// show payment wizard
var dialog = new frappe.ui.Dialog({
@@ -450,8 +450,7 @@
if (is_cash && !dialog.get_value("change")) {
// set to nearest 5
- var paid_amount = 5 * Math.ceil(dialog.get_value("total_amount") / 5);
- dialog.set_value("paid_amount", paid_amount);
+ dialog.set_value("paid_amount", dialog.get_value("total_amount"));
dialog.get_input("paid_amount").trigger("change");
}
}).trigger("change");
@@ -464,7 +463,6 @@
var me = this;
dialog.set_primary_action(__("Pay"), function() {
var values = dialog.get_values();
- console.log(values);
var is_cash = values.mode_of_payment === __("Cash");
if (!is_cash) {
values.write_off_amount = values.change = 0.0;
@@ -488,6 +486,12 @@
});
erpnext.pos.make_pos_btn = function(frm) {
+ frm.page.add_menu_item(__("{0} View", [frm.page.current_view_name === "pos" ? "Form" : "Point-of-Sale"]), function() {
+ erpnext.pos.toggle(frm);
+ });
+
+ if(frm.pos_btn) return;
+
// Show POS button only if it is enabled from features setup
if (cint(sys_defaults.fs_pos_view)!==1 || frm.doctype==="Material Request") {
return;
@@ -495,11 +499,12 @@
if(!frm.pos_btn) {
frm.pos_btn = frm.page.add_action_icon("icon-th", function() {
- erpnext.pos.toggle(frm) });
+ erpnext.pos.toggle(frm);
+ });
}
- if(erpnext.open_as_pos && !frm.pos_active) {
- erpnext.pos.toggle(frm);
+ if(erpnext.open_as_pos && frm.page.current_view_name !== "pos") {
+ erpnext.pos.toggle(frm, true);
}
}
@@ -508,12 +513,22 @@
var price_list = frappe.meta.has_field(cur_frm.doc.doctype, "selling_price_list") ?
frm.doc.selling_price_list : frm.doc.buying_price_list;
- if((show===true && frm.pos_active) || (show===false && !frm.pos_active)) {
- return;
+ if(show!==undefined) {
+ if((show===true && frm.page.current_view_name === "pos")
+ || (show===false && frm.page.current_view_name === "main")) {
+ return;
+ }
}
- if(show && !price_list) {
- frappe.throw(__("Please select Price List"));
+ if(frm.page.current_view_name!=="pos") {
+ // before switching, ask for pos name
+ if(!price_list) {
+ frappe.throw(__("Please select Price List"));
+ }
+
+ if(!frm.doc.company) {
+ frappe.throw(__("Please select Company"));
+ }
}
// make pos
@@ -523,14 +538,13 @@
}
// toggle view
- frm.page.set_view(frm.pos_active ? "main" : "pos");
- frm.pos_active = !frm.pos_active;
+ frm.page.set_view(frm.page.current_view_name==="pos" ? "main" : "pos");
frm.toolbar.current_status = null;
frm.refresh();
// refresh
- if(frm.pos_active) {
+ if(frm.page.current_view_name==="pos") {
frm.pos.refresh();
}
}
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
index ffbebe4..c93c76c 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -9,8 +9,8 @@
</div>
{% if(actual_qty != null) { %}
<div style="margin-top: 5px;" class="text-muted small text-right">
- <span title="{%= __("In Stock") %}">{%= actual_qty %}<span>
- <span title="{%= __("Projected") %}">({%= projected_qty %})<span>
+ <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
+ <span title="{%= __("Projected") %}">({%= projected_qty || 0 %})<span>
</div>
{% } %}
</div>
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index 6b3e3f2..e07e3d4 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -139,7 +139,7 @@
if(sl.voucher_type=="Stock Reconciliation") {
var diff = (sl.qty_after_transaction * sl.valuation_rate) - item.closing_qty_value;
- wh.fifo_stack.push([sl.qty_after_transaction, sl.valuation_rate, sl.posting_date]);
+ wh.fifo_stack = [[sl.qty_after_transaction, sl.valuation_rate, sl.posting_date]];
wh.balance_qty = sl.qty_after_transaction;
wh.balance_value = sl.valuation_rate * sl.qty_after_transaction;
} else {
@@ -167,7 +167,6 @@
},
update_groups: function() {
var me = this;
-
$.each(this.data, function(i, item) {
// update groups
if(!item.is_group && me.apply_filter(item, "brand")) {
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 5476d14..5b38559 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -14,19 +14,21 @@
},
get_fiscal_year: function(company, date, fn) {
- frappe.call({
- type:"GET",
- method: "erpnext.accounts.utils.get_fiscal_year",
- args: {
- "company": company,
- "date": date,
- "verbose": 0
- },
- callback: function(r) {
- if (r.message) cur_frm.set_value("fiscal_year", r.message[0]);
- if (fn) fn();
- }
- });
+ if(frappe.meta.get_docfield(cur_frm.doctype, "fiscal_year")) {
+ frappe.call({
+ type:"GET",
+ method: "erpnext.accounts.utils.get_fiscal_year",
+ args: {
+ "company": company,
+ "date": date,
+ "verbose": 0
+ },
+ callback: function(r) {
+ if (r.message) cur_frm.set_value("fiscal_year", r.message[0]);
+ if (fn) fn();
+ }
+ });
+ }
},
toggle_naming_series: function() {
@@ -129,5 +131,29 @@
}
);
}
+ },
+
+ copy_value_in_all_row: function(doc, dt, dn, table_fieldname, fieldname) {
+ var d = locals[dt][dn];
+ if(d[fieldname]){
+ var cl = doc[table_fieldname] || [];
+ for(var i = 0; i < cl.length; i++) {
+ if(!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
+ }
+ }
+ refresh_field(table_fieldname);
}
-})
+});
+
+// add description on posting time
+$(document).on('app_ready', function() {
+ if(!frappe.datetime.is_timezone_same()) {
+ $.each(["Stock Reconciliation", "Stock Entry", "Stock Ledger Entry",
+ "Delivery Note", "Purchase Receipt", "Sales Invoice"], function(i, d) {
+ frappe.ui.form.on(d, "onload", function(frm) {
+ cur_frm.set_df_property("posting_time", "description",
+ sys_defaults.time_zone);
+ });
+ });
+ }
+});
diff --git a/erpnext/public/js/website_utils.js b/erpnext/public/js/website_utils.js
index 2ca9cf8..b0fc557 100644
--- a/erpnext/public/js/website_utils.js
+++ b/erpnext/public/js/website_utils.js
@@ -15,5 +15,15 @@
});
};
+erpnext.subscribe_to_newsletter = function(opts, btn) {
+ return frappe.call({
+ type: "POST",
+ method: "erpnext.crm.doctype.newsletter.newsletter.subscribe",
+ btn: btn,
+ args: {"email": opts.email},
+ callback: opts.callback
+ });
+}
+
// for backward compatibility
-erpnext.send_message = frappe.send_message;
\ No newline at end of file
+erpnext.send_message = frappe.send_message;
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index c42cb4c..c0667cc 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -51,3 +51,10 @@
.product-text {
padding: 15px 0px;
}
+
+@media (max-width: 767px) {
+ .product-search {
+ width: 100%;
+ margin-bottom: 13px;
+ }
+}
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index f281175..cced319 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -1,366 +1,375 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "naming_series:",
- "creation": "2013-06-11 14:26:44",
- "description": "Buyer of Goods and Services.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-06-11 14:26:44",
+ "description": "Buyer of Goods and Services.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "basic_info",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-user",
- "permlevel": 0,
+ "fieldname": "basic_info",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-user",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "options": "CUST-",
- "permlevel": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "options": "CUST-",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Full Name",
- "no_copy": 1,
- "oldfieldname": "customer_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "report_hide": 0,
- "reqd": 1,
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Full Name",
+ "no_copy": 1,
+ "oldfieldname": "customer_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "report_hide": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "customer_type",
- "fieldtype": "Select",
- "label": "Type",
- "oldfieldname": "customer_type",
- "oldfieldtype": "Select",
- "options": "\nCompany\nIndividual",
- "permlevel": 0,
+ "fieldname": "customer_type",
+ "fieldtype": "Select",
+ "label": "Type",
+ "oldfieldname": "customer_type",
+ "oldfieldtype": "Select",
+ "options": "\nCompany\nIndividual",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "lead_name",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "From Lead",
- "no_copy": 1,
- "oldfieldname": "lead_name",
- "oldfieldtype": "Link",
- "options": "Lead",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "lead_name",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "From Lead",
+ "no_copy": 1,
+ "oldfieldname": "lead_name",
+ "oldfieldtype": "Link",
+ "options": "Lead",
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 1
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Customer Group",
- "oldfieldname": "customer_group",
- "oldfieldtype": "Link",
- "options": "Customer Group",
- "permlevel": 0,
- "print_hide": 0,
- "reqd": 1,
+ "description": "",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Customer Group",
+ "oldfieldname": "customer_group",
+ "oldfieldtype": "Link",
+ "options": "Customer Group",
+ "permlevel": 0,
+ "print_hide": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "description": "",
- "fieldname": "territory",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Territory",
- "oldfieldname": "territory",
- "oldfieldtype": "Link",
- "options": "Territory",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Territory",
+ "oldfieldname": "territory",
+ "oldfieldtype": "Link",
+ "options": "Territory",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "address_contacts",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-map-marker",
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "address_contacts",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-map-marker",
"permlevel": 0
- },
+ },
{
- "fieldname": "address_html",
- "fieldtype": "HTML",
- "label": "Address HTML",
- "permlevel": 0,
+ "fieldname": "address_html",
+ "fieldtype": "HTML",
+ "label": "Address HTML",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "contact_html",
- "fieldtype": "HTML",
- "label": "Contact HTML",
- "oldfieldtype": "HTML",
- "permlevel": 0,
+ "fieldname": "contact_html",
+ "fieldtype": "HTML",
+ "label": "Contact HTML",
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "default_receivable_accounts",
- "fieldtype": "Section Break",
- "label": "Default Receivable Accounts",
+ "fieldname": "default_receivable_accounts",
+ "fieldtype": "Section Break",
+ "label": "Default Receivable Accounts",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "Mention if non-standard receivable account applicable",
- "fieldname": "accounts",
- "fieldtype": "Table",
- "label": "Accounts",
- "options": "Party Account",
+ "depends_on": "eval:!doc.__islocal",
+ "description": "Mention if non-standard receivable account applicable",
+ "fieldname": "accounts",
+ "fieldtype": "Table",
+ "label": "Accounts",
+ "options": "Party Account",
"permlevel": 0
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "Your Customer's TAX registration numbers (if applicable) or any general information",
- "fieldname": "customer_details",
- "fieldtype": "Text",
- "label": "Customer Details",
- "oldfieldname": "customer_details",
- "oldfieldtype": "Code",
+ "description": "Your Customer's TAX registration numbers (if applicable) or any general information",
+ "fieldname": "customer_details",
+ "fieldtype": "Text",
+ "label": "Customer Details",
+ "oldfieldname": "customer_details",
+ "oldfieldtype": "Code",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "default_currency",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Currency",
- "no_copy": 1,
- "options": "Currency",
+ "fieldname": "default_currency",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Currency",
+ "no_copy": 1,
+ "options": "Currency",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_price_list",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Price List",
- "options": "Price List",
+ "fieldname": "default_price_list",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Price List",
+ "options": "Price List",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_taxes_and_charges",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Taxes and Charges",
- "options": "Sales Taxes and Charges Template",
+ "fieldname": "default_taxes_and_charges",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Taxes and Charges",
+ "options": "Sales Taxes and Charges Template",
"permlevel": 0
- },
+ },
{
- "fieldname": "credit_days",
- "fieldtype": "Int",
- "label": "Credit Days",
- "oldfieldname": "credit_days",
- "oldfieldtype": "Int",
+ "fieldname": "credit_days_based_on",
+ "fieldtype": "Select",
+ "label": "Credit Days Based On",
+ "options": "\nFixed Days\nLast Day of the Next Month",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'",
+ "fieldname": "credit_days",
+ "fieldtype": "Int",
+ "label": "Credit Days",
+ "oldfieldname": "credit_days",
+ "oldfieldtype": "Int",
"permlevel": 1
- },
+ },
{
- "fieldname": "credit_limit",
- "fieldtype": "Currency",
- "label": "Credit Limit",
- "oldfieldname": "credit_limit",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "fieldname": "credit_limit",
+ "fieldtype": "Currency",
+ "label": "Credit Limit",
+ "oldfieldname": "credit_limit",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"permlevel": 1
- },
+ },
{
- "fieldname": "website",
- "fieldtype": "Data",
- "label": "Website",
+ "fieldname": "website",
+ "fieldtype": "Data",
+ "label": "Website",
"permlevel": 0
- },
+ },
{
- "fieldname": "sales_team_section_break",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-group",
+ "fieldname": "sales_team_section_break",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-group",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_sales_partner",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Sales Partner",
- "oldfieldname": "default_sales_partner",
- "oldfieldtype": "Link",
- "options": "Sales Partner",
+ "fieldname": "default_sales_partner",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Sales Partner",
+ "oldfieldname": "default_sales_partner",
+ "oldfieldtype": "Link",
+ "options": "Sales Partner",
"permlevel": 0
- },
+ },
{
- "fieldname": "default_commission_rate",
- "fieldtype": "Float",
- "label": "Commission Rate",
- "oldfieldname": "default_commission_rate",
- "oldfieldtype": "Currency",
+ "fieldname": "default_commission_rate",
+ "fieldtype": "Float",
+ "label": "Commission Rate",
+ "oldfieldname": "default_commission_rate",
+ "oldfieldtype": "Currency",
"permlevel": 0
- },
+ },
{
- "fieldname": "sales_team",
- "fieldtype": "Table",
- "label": "Sales Team Details",
- "oldfieldname": "sales_team",
- "oldfieldtype": "Table",
- "options": "Sales Team",
+ "fieldname": "sales_team",
+ "fieldtype": "Table",
+ "label": "Sales Team Details",
+ "oldfieldname": "sales_team",
+ "oldfieldtype": "Table",
+ "options": "Sales Team",
"permlevel": 0
- },
+ },
{
- "fieldname": "communications",
- "fieldtype": "Table",
- "hidden": 1,
- "label": "Communications",
- "options": "Communication",
- "permlevel": 0,
+ "fieldname": "communications",
+ "fieldtype": "Table",
+ "hidden": 1,
+ "label": "Communications",
+ "options": "Communication",
+ "permlevel": 0,
"print_hide": 1
}
- ],
- "icon": "icon-user",
- "idx": 1,
- "modified": "2015-02-24 17:32:36.065248",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Customer",
- "owner": "Administrator",
+ ],
+ "icon": "icon-user",
+ "idx": 1,
+ "modified": "2015-07-13 05:28:25.753684",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Customer",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 1,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "cancel": 0,
- "delete": 0,
- "permlevel": 1,
- "read": 1,
+ "cancel": 0,
+ "delete": 0,
+ "permlevel": 1,
+ "read": 1,
"role": "Sales User"
- },
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Sales Manager"
- },
+ },
{
- "amend": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Master Manager",
- "set_user_permissions": 1,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Master Manager",
+ "set_user_permissions": 1,
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "cancel": 0,
- "delete": 0,
- "permlevel": 1,
- "read": 1,
- "role": "Sales Master Manager",
+ "cancel": 0,
+ "delete": 0,
+ "permlevel": 1,
+ "read": 1,
+ "role": "Sales Master Manager",
"write": 1
- },
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material User"
- },
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User"
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material Manager"
- },
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager"
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Accounts User"
- },
+ },
{
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Accounts Manager"
}
- ],
- "search_fields": "customer_name,customer_group,territory",
+ ],
+ "search_fields": "customer_name,customer_group,territory",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 479c5b5..1db6c6a 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -34,7 +34,9 @@
make_test_records("Address")
make_test_records("Contact")
-
+ frappe.db.set_value("Contact", "_Test Contact For _Test Customer-_Test Customer",
+ "is_primary_contact", 1)
+
details = get_party_details("_Test Customer")
for key, value in to_check.iteritems():
diff --git a/erpnext/selling/doctype/product_bundle/__init__.py b/erpnext/selling/doctype/product_bundle/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/selling/doctype/product_bundle/__init__.py
diff --git a/erpnext/selling/doctype/sales_bom/sales_bom.js b/erpnext/selling/doctype/product_bundle/product_bundle.js
similarity index 82%
rename from erpnext/selling/doctype/sales_bom/sales_bom.js
rename to erpnext/selling/doctype/product_bundle/product_bundle.js
index 0b64a5f..2849be5 100644
--- a/erpnext/selling/doctype/sales_bom/sales_bom.js
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.js
@@ -7,10 +7,10 @@
cur_frm.fields_dict.new_item_code.get_query = function() {
return{
- query: "erpnext.selling.doctype.sales_bom.sales_bom.get_new_item_code"
+ query: "erpnext.selling.doctype.product_bundle.product_bundle.get_new_item_code"
}
}
-cur_frm.fields_dict.new_item_code.query_description = __('Please select Item where "Is Stock Item" is "No" and "Is Sales Item" is "Yes" and there is no other Sales BOM');
+cur_frm.fields_dict.new_item_code.query_description = __('Please select Item where "Is Stock Item" is "No" and "Is Sales Item" is "Yes" and there is no other Product Bundle');
cur_frm.cscript.item_code = function(doc, dt, dn) {
var d = locals[dt][dn];
diff --git a/erpnext/selling/doctype/sales_bom/sales_bom.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
similarity index 89%
rename from erpnext/selling/doctype/sales_bom/sales_bom.json
rename to erpnext/selling/doctype/product_bundle/product_bundle.json
index bf366f7..3f4e296 100644
--- a/erpnext/selling/doctype/sales_bom/sales_bom.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json
@@ -1,7 +1,7 @@
{
"allow_import": 1,
"creation": "2013-06-20 11:53:21",
- "description": "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 Sales BOM Item.\n\nNote: BOM = Bill of Materials",
+ "description": "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",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
@@ -38,7 +38,7 @@
"label": "Items",
"oldfieldname": "sales_bom_items",
"oldfieldtype": "Table",
- "options": "Sales BOM Item",
+ "options": "Product Bundle Item",
"permlevel": 0,
"reqd": 1
}
@@ -46,10 +46,10 @@
"icon": "icon-sitemap",
"idx": 1,
"is_submittable": 0,
- "modified": "2015-02-20 05:05:03.719573",
+ "modified": "2015-07-13 05:28:28.140327",
"modified_by": "Administrator",
"module": "Selling",
- "name": "Sales BOM",
+ "name": "Product Bundle",
"owner": "Administrator",
"permissions": [
{
@@ -61,7 +61,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -76,7 +76,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
},
diff --git a/erpnext/selling/doctype/sales_bom/sales_bom.py b/erpnext/selling/doctype/product_bundle/product_bundle.py
similarity index 92%
rename from erpnext/selling/doctype/sales_bom/sales_bom.py
rename to erpnext/selling/doctype/product_bundle/product_bundle.py
index ddb955f..796b4b4 100644
--- a/erpnext/selling/doctype/sales_bom/sales_bom.py
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.py
@@ -8,9 +8,7 @@
from frappe.model.document import Document
-class SalesBOM(Document):
-
-
+class ProductBundle(Document):
def autoname(self):
self.name = self.new_item_code
@@ -39,7 +37,7 @@
return frappe.db.sql("""select name, item_name, description from tabItem
where is_stock_item="No" and is_sales_item="Yes"
- and name not in (select name from `tabSales BOM`) and %s like %s
+ and name not in (select name from `tabProduct Bundle`) and %s like %s
%s limit %s, %s""" % (searchfield, "%s",
get_match_cond(doctype),"%s", "%s"),
("%%%s%%" % txt, start, page_len))
diff --git a/erpnext/selling/doctype/sales_bom/test_sales_bom.py b/erpnext/selling/doctype/product_bundle/test_product_bundle.py
similarity index 75%
rename from erpnext/selling/doctype/sales_bom/test_sales_bom.py
rename to erpnext/selling/doctype/product_bundle/test_product_bundle.py
index ad9e22b..8c5fe12 100644
--- a/erpnext/selling/doctype/sales_bom/test_sales_bom.py
+++ b/erpnext/selling/doctype/product_bundle/test_product_bundle.py
@@ -1,7 +1,8 @@
+
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
-test_records = frappe.get_test_records('Sales BOM')
+test_records = frappe.get_test_records('Product Bundle')
\ No newline at end of file
diff --git a/erpnext/selling/doctype/product_bundle/test_records.json b/erpnext/selling/doctype/product_bundle/test_records.json
new file mode 100644
index 0000000..b92892f
--- /dev/null
+++ b/erpnext/selling/doctype/product_bundle/test_records.json
@@ -0,0 +1,20 @@
+[
+ {
+ "doctype": "Product Bundle",
+ "new_item_code": "_Test Product Bundle Item",
+ "items": [
+ {
+ "doctype": "Product Bundle Item",
+ "item_code": "_Test Item",
+ "parentfield": "items",
+ "qty": 5.0
+ },
+ {
+ "doctype": "Product Bundle Item",
+ "item_code": "_Test Item Home Desktop 100",
+ "parentfield": "items",
+ "qty": 2.0
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/product_bundle_item/__init__.py b/erpnext/selling/doctype/product_bundle_item/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/selling/doctype/product_bundle_item/__init__.py
diff --git a/erpnext/selling/doctype/sales_bom_item/sales_bom_item.json b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
similarity index 88%
rename from erpnext/selling/doctype/sales_bom_item/sales_bom_item.json
rename to erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
index c48debd..d219125 100644
--- a/erpnext/selling/doctype/sales_bom_item/sales_bom_item.json
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -1,5 +1,5 @@
{
- "creation": "2013-05-23 16:55:51.000000",
+ "creation": "2013-05-23 16:55:51",
"docstatus": 0,
"doctype": "DocType",
"fields": [
@@ -60,9 +60,10 @@
],
"idx": 1,
"istable": 1,
- "modified": "2013-12-20 19:21:38.000000",
+ "modified": "2015-07-06 06:05:18.854360",
"modified_by": "Administrator",
"module": "Selling",
- "name": "Sales BOM Item",
- "owner": "Administrator"
+ "name": "Product Bundle Item",
+ "owner": "Administrator",
+ "permissions": []
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.py b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.py
new file mode 100644
index 0000000..8721bfa
--- /dev/null
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProductBundleItem(Document):
+ pass
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 1725de7..d717e20 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -34,8 +34,7 @@
method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
source_doctype: "Opportunity",
get_query_filters: {
- docstatus: 1,
- status: "Submitted",
+ status: ["not in", ["Lost", "Closed"]],
enquiry_type: cur_frm.doc.order_type,
customer: cur_frm.doc.customer || undefined,
lead: cur_frm.doc.lead || undefined,
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index b5b6aa2..b2e74b3 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1,994 +1,994 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-24 19:29:08",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-24 19:29:08",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "customer_section",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-user",
+ "fieldname": "customer_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "QTN-",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "QTN-",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "default": "Customer",
- "fieldname": "quotation_to",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Quotation To",
- "oldfieldname": "quotation_to",
- "oldfieldtype": "Select",
- "options": "\nLead\nCustomer",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0,
+ "default": "Customer",
+ "fieldname": "quotation_to",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Quotation To",
+ "oldfieldname": "quotation_to",
+ "oldfieldtype": "Select",
+ "options": "\nLead\nCustomer",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 0,
"reqd": 1
- },
+ },
{
- "depends_on": "eval:doc.quotation_to == \"Customer\"",
- "fieldname": "customer",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Customer",
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "depends_on": "eval:doc.quotation_to == \"Customer\"",
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Customer",
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "depends_on": "eval:doc.quotation_to == \"Lead\"",
- "fieldname": "lead",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Lead",
- "oldfieldname": "lead",
- "oldfieldtype": "Link",
- "options": "Lead",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.quotation_to == \"Lead\"",
+ "fieldname": "lead",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Lead",
+ "oldfieldname": "lead",
+ "oldfieldtype": "Link",
+ "options": "Lead",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Customer / Lead Name",
- "permlevel": 0,
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Customer / Lead Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "in_filter": 0,
- "label": "Address",
- "oldfieldname": "customer_address",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "in_filter": 0,
+ "label": "Address",
+ "oldfieldname": "customer_address",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "in_filter": 0,
- "label": "Contact",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "in_filter": 0,
+ "label": "Contact",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "options": "Quotation",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "options": "Quotation",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "description": "",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0,
+ "description": "",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0,
"width": "150px"
- },
+ },
{
- "default": "Today",
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "no_copy": 1,
- "oldfieldname": "transaction_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1,
- "search_index": 1,
+ "default": "Today",
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "no_copy": 1,
+ "oldfieldname": "transaction_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1,
"width": "100px"
- },
+ },
{
- "default": "Sales",
- "fieldname": "order_type",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Order Type",
- "oldfieldname": "order_type",
- "oldfieldtype": "Select",
- "options": "\nSales\nMaintenance\nShopping Cart",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "default": "Sales",
+ "fieldname": "order_type",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Order Type",
+ "oldfieldname": "order_type",
+ "oldfieldtype": "Select",
+ "options": "\nSales\nMaintenance\nShopping Cart",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
- "permlevel": 0,
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0,
"width": "100px"
- },
+ },
{
- "description": "Rate at which customer's currency is converted to company's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Exchange Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "description": "Rate at which customer's currency is converted to company's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "selling_price_list",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "Price List",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0,
+ "fieldname": "selling_price_list",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "Price List",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0,
"width": "100px"
- },
+ },
{
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "description": "Rate at which Price list currency is converted to company's base currency",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "read_only": 0,
+ "description": "Rate at which Price list currency is converted to company's base currency",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
"print_hide": 1
- },
+ },
{
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
"search_index": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "oldfieldname": "quotation_details",
- "oldfieldtype": "Table",
- "options": "Quotation Item",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "quotation_details",
+ "oldfieldtype": "Table",
+ "options": "Quotation Item",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 0,
"width": "40px"
- },
+ },
{
- "fieldname": "sec_break23",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "sec_break23",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "hidden": 0,
- "label": "Net Total (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "label": "Net Total (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0,
"width": "100px"
- },
+ },
{
- "fieldname": "column_break_28",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_28",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
"read_only": 1
- },
+ },
{
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "hidden": 0,
- "label": "Net Total",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "label": "Net Total",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "Taxes and Charges",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "Taxes and Charges",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Taxes and Charges",
- "oldfieldname": "charge",
- "oldfieldtype": "Link",
- "options": "Sales Taxes and Charges Template",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Taxes and Charges",
+ "oldfieldname": "charge",
+ "oldfieldtype": "Link",
+ "options": "Sales Taxes and Charges Template",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break_34",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_34",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "shipping_rule",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Shipping Rule",
- "oldfieldtype": "Button",
- "options": "Shipping Rule",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "shipping_rule",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Shipping Rule",
+ "oldfieldtype": "Button",
+ "options": "Shipping Rule",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_36",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_36",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Sales Taxes and Charges",
- "oldfieldname": "other_charges",
- "oldfieldtype": "Table",
- "options": "Sales Taxes and Charges",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Sales Taxes and Charges",
+ "oldfieldname": "other_charges",
+ "oldfieldtype": "Table",
+ "options": "Sales Taxes and Charges",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_39",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_39",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break_42",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_42",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "section_break_44",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_44",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Discount On",
- "options": "\nGrand Total\nNet Total",
- "permlevel": 0,
- "precision": "",
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "permlevel": 0,
+ "precision": "",
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_46",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_46",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency",
- "permlevel": 0,
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0,
"width": "200px"
- },
+ },
{
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "description": "In Words will be visible once you save the Quotation.",
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "description": "In Words will be visible once you save the Quotation.",
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "no_copy": 0,
- "oldfieldname": "grand_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "no_copy": 0,
+ "oldfieldname": "grand_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 0,
"width": "200px"
- },
+ },
{
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "no_copy": 0,
- "oldfieldname": "rounded_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "no_copy": 0,
+ "oldfieldname": "rounded_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 0,
"width": "200px"
- },
+ },
{
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "no_copy": 0,
- "oldfieldname": "in_words_export",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "no_copy": 0,
+ "oldfieldname": "in_words_export",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "fieldname": "fold",
- "fieldtype": "Fold",
- "label": "Fold",
+ "fieldname": "fold",
+ "fieldtype": "Fold",
+ "label": "Fold",
"permlevel": 0
- },
+ },
{
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "oldfieldtype": "Section Break",
- "options": "icon-legal",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "oldfieldtype": "Section Break",
+ "options": "icon-legal",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 1
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Term Details",
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Term Details",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "contact_section",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "options": "icon-bullhorn",
- "permlevel": 0,
+ "fieldname": "contact_section",
+ "fieldtype": "Section Break",
+ "label": "Contact Info",
+ "options": "icon-bullhorn",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "description": "",
- "fieldname": "territory",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "description": "",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "depends_on": "customer",
- "description": "",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "oldfieldname": "customer_group",
- "oldfieldtype": "Link",
- "options": "Customer Group",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 0,
+ "depends_on": "customer",
+ "description": "",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "oldfieldname": "customer_group",
+ "oldfieldtype": "Link",
+ "options": "Customer Group",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "shipping_address_name",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Shipping Address",
- "options": "Address",
- "permlevel": 0,
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Shipping Address",
+ "options": "Address",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "shipping_address",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Shipping Address",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "shipping_address",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Shipping Address",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "depends_on": "customer",
- "fieldname": "col_break98",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "depends_on": "customer",
+ "fieldname": "col_break98",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "customer_address",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Customer Address",
- "options": "Address",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "customer_address",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Customer Address",
+ "options": "Address",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "depends_on": "eval:doc.customer",
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Contact Person",
- "oldfieldname": "contact_person",
- "oldfieldtype": "Link",
- "options": "Contact",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "depends_on": "eval:doc.customer",
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Contact Person",
+ "oldfieldname": "contact_person",
+ "oldfieldtype": "Link",
+ "options": "Contact",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "campaign",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Campaign",
- "no_copy": 0,
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Campaign",
+ "no_copy": 0,
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 0
- },
+ },
{
- "fieldname": "source",
- "fieldtype": "Select",
- "hidden": 0,
- "label": "Source",
- "no_copy": 0,
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "label": "Source",
+ "no_copy": 0,
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 0
- },
+ },
{
- "allow_on_submit": 0,
- "default": "Draft",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
+ "allow_on_submit": 0,
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "order_lost_reason",
- "fieldtype": "Small Text",
- "label": "Quotation Lost Reason",
- "no_copy": 1,
- "oldfieldname": "order_lost_reason",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "order_lost_reason",
+ "fieldtype": "Small Text",
+ "label": "Quotation Lost Reason",
+ "no_copy": 1,
+ "oldfieldname": "order_lost_reason",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 1
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "enq_det",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "Opportunity Item",
- "no_copy": 0,
- "oldfieldname": "enq_det",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "enq_det",
+ "fieldtype": "Text",
+ "hidden": 1,
+ "label": "Opportunity Item",
+ "no_copy": 0,
+ "oldfieldname": "enq_det",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"report_hide": 0
}
- ],
- "hide_toolbar": 0,
- "icon": "icon-shopping-cart",
- "idx": 1,
- "is_submittable": 1,
- "max_attachments": 1,
- "modified": "2015-03-23 14:45:49.596357",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Quotation",
- "owner": "Administrator",
+ ],
+ "hide_toolbar": 0,
+ "icon": "icon-shopping-cart",
+ "idx": 1,
+ "is_submittable": 1,
+ "max_attachments": 1,
+ "modified": "2015-06-15 15:37:39.199814",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Quotation",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "match": "",
- "permlevel": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "submit": 0,
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "match": "",
+ "permlevel": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "cancel": 0,
- "delete": 0,
- "email": 1,
- "match": "",
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "cancel": 0,
+ "delete": 0,
+ "email": 1,
+ "match": "",
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Customer"
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "match": "",
- "permlevel": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Manager",
- "submit": 0,
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "match": "",
+ "permlevel": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Manager",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Maintenance Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Maintenance Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "match": "",
- "permlevel": 1,
- "read": 1,
- "report": 1,
- "role": "Maintenance Manager",
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "match": "",
+ "permlevel": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Maintenance Manager",
"submit": 0
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Maintenance User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Maintenance User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "match": "",
- "permlevel": 1,
- "read": 1,
- "report": 1,
- "role": "Maintenance User",
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "match": "",
+ "permlevel": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Maintenance User",
"submit": 0
}
- ],
- "read_only_onload": 1,
- "search_fields": "status,transaction_date,customer,lead,order_type",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only_onload": 1,
+ "search_fields": "status,transaction_date,customer,lead,order_type",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation_list.js b/erpnext/selling/doctype/quotation/quotation_list.js
index add7aef..204ace1 100644
--- a/erpnext/selling/doctype/quotation/quotation_list.js
+++ b/erpnext/selling/doctype/quotation/quotation_list.js
@@ -2,7 +2,9 @@
add_fields: ["customer_name", "base_grand_total", "status",
"company", "currency"],
get_indicator: function(doc) {
- if(doc.status==="Ordered") {
+ if(doc.status==="Submitted") {
+ return [__("Submitted"), "blue", "status,=,Submitted"];
+ } else if(doc.status==="Ordered") {
return [__("Ordered"), "green", "status,=,Ordered"];
} else if(doc.status==="Lost") {
return [__("Lost"), "darkgrey", "status,=,Lost"];
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index 7496429..3f30d05 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -6,7 +6,7 @@
from frappe.utils import flt
import unittest
-test_dependencies = ["Sales BOM"]
+test_dependencies = ["Product Bundle"]
class TestQuotation(unittest.TestCase):
def test_make_sales_order(self):
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 621b204..ec10b59 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -55,7 +55,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -121,10 +121,11 @@
"width": "100px"
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount (%)",
+ "label": "Discount on Price List Rate (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
"permlevel": 0,
@@ -297,12 +298,13 @@
},
{
"fieldname": "prevdoc_doctype",
- "fieldtype": "Data",
+ "fieldtype": "Link",
"hidden": 1,
"label": "Against Doctype",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
"oldfieldtype": "Data",
+ "options": "DocType",
"permlevel": 0,
"print_hide": 1,
"print_width": "150px",
@@ -312,11 +314,12 @@
},
{
"fieldname": "prevdoc_docname",
- "fieldtype": "Data",
+ "fieldtype": "Dynamic Link",
"label": "Against Docname",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Data",
+ "options": "prevdoc_doctype",
"permlevel": 0,
"print_hide": 1,
"print_width": "150px",
@@ -389,7 +392,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:51:21.557189",
+ "modified": "2015-06-02 14:18:00.266748",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",
diff --git a/erpnext/selling/doctype/sales_bom/__init__.py b/erpnext/selling/doctype/sales_bom/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/selling/doctype/sales_bom/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/selling/doctype/sales_bom/test_records.json b/erpnext/selling/doctype/sales_bom/test_records.json
deleted file mode 100644
index a19bc1a..0000000
--- a/erpnext/selling/doctype/sales_bom/test_records.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
- "doctype": "Sales BOM",
- "new_item_code": "_Test Sales BOM Item",
- "items": [
- {
- "doctype": "Sales BOM Item",
- "item_code": "_Test Item",
- "parentfield": "items",
- "qty": 5.0
- },
- {
- "doctype": "Sales BOM Item",
- "item_code": "_Test Item Home Desktop 100",
- "parentfield": "items",
- "qty": 2.0
- }
- ]
- }
-]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_bom_item/__init__.py b/erpnext/selling/doctype/sales_bom_item/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/selling/doctype/sales_bom_item/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/selling/doctype/sales_bom_item/sales_bom_item.py b/erpnext/selling/doctype/sales_bom_item/sales_bom_item.py
deleted file mode 100644
index 27d515b..0000000
--- a/erpnext/selling/doctype/sales_bom_item/sales_bom_item.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe.model.document import Document
-
-class SalesBOMItem(Document):
- pass
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 7ede9d4..7f0b386 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -183,5 +183,3 @@
cur_frm.email_doc(frappe.boot.notification_settings.sales_order_message);
}
};
-
-;
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index f76d08e..4ce961d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1,1178 +1,1187 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-06-18 12:39:59",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-06-18 12:39:59",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "customer_section",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-user",
+ "fieldname": "customer_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "in_filter": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "search_index": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "in_filter": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "search_index": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "SO-",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "SO-",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "customer",
- "fieldtype": "Link",
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Customer",
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Customer",
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Name",
- "permlevel": 0,
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Customer Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Address",
- "permlevel": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Address",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "default": "Sales",
- "fieldname": "order_type",
- "fieldtype": "Select",
- "in_list_view": 0,
- "label": "Order Type",
- "oldfieldname": "order_type",
- "oldfieldtype": "Select",
- "options": "\nSales\nMaintenance\nShopping Cart",
- "permlevel": 0,
- "print_hide": 1,
+ "default": "Sales",
+ "fieldname": "order_type",
+ "fieldtype": "Select",
+ "in_list_view": 0,
+ "label": "Order Type",
+ "oldfieldname": "order_type",
+ "oldfieldtype": "Select",
+ "options": "\nSales\nMaintenance\nShopping Cart",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 1,
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "options": "Sales Order",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "options": "Sales Order",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "description": "",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1,
+ "description": "",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "default": "Today",
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "no_copy": 1,
- "oldfieldname": "transaction_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "reqd": 1,
- "search_index": 1,
+ "default": "Today",
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "no_copy": 1,
+ "oldfieldname": "transaction_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "reqd": 1,
+ "search_index": 1,
"width": "160px"
- },
+ },
{
- "depends_on": "eval:doc.order_type == 'Sales'",
- "fieldname": "delivery_date",
- "fieldtype": "Date",
- "hidden": 0,
- "in_filter": 1,
- "label": "Delivery Date",
- "oldfieldname": "delivery_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 0,
- "search_index": 1,
+ "depends_on": "eval:doc.order_type == 'Sales'",
+ "fieldname": "delivery_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Delivery Date",
+ "oldfieldname": "delivery_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 0,
+ "search_index": 1,
"width": "160px"
- },
+ },
{
- "description": "Customer's Purchase Order Number",
- "fieldname": "po_no",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "PO No",
- "no_copy": 0,
- "oldfieldname": "po_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "reqd": 0,
+ "description": "Customer's Purchase Order Number",
+ "fieldname": "po_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "PO No",
+ "no_copy": 0,
+ "oldfieldname": "po_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "reqd": 0,
"width": "100px"
- },
+ },
{
- "depends_on": "eval:doc.po_no",
- "description": "Customer's Purchase Order Date",
- "fieldname": "po_date",
- "fieldtype": "Date",
- "hidden": 0,
- "label": "PO Date",
- "oldfieldname": "po_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "reqd": 0,
+ "depends_on": "eval:doc.po_no",
+ "description": "Customer's Purchase Order Date",
+ "fieldname": "po_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "label": "PO Date",
+ "oldfieldname": "po_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "reqd": 0,
"width": "100px"
- },
+ },
{
- "fieldname": "shipping_address_name",
- "fieldtype": "Link",
- "hidden": 1,
- "in_filter": 1,
- "label": "Shipping Address Name",
- "options": "Address",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "in_filter": 1,
+ "label": "Shipping Address Name",
+ "options": "Address",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "shipping_address",
- "fieldtype": "Small Text",
- "hidden": 1,
- "in_filter": 0,
- "label": "Shipping Address",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "shipping_address",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "in_filter": 0,
+ "label": "Shipping Address",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
- "permlevel": 0,
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"width": "100px"
- },
+ },
{
- "description": "Rate at which customer's currency is converted to company's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Exchange Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "reqd": 1,
+ "description": "Rate at which customer's currency is converted to company's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "reqd": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "selling_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "Price List",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "fieldname": "selling_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "Price List",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "description": "Rate at which Price list currency is converted to company's base currency",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
+ "description": "Rate at which Price list currency is converted to company's base currency",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
"print_hide": 1
- },
+ },
{
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "oldfieldname": "sales_order_details",
- "oldfieldtype": "Table",
- "options": "Sales Order Item",
- "permlevel": 0,
- "print_hide": 0,
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "sales_order_details",
+ "oldfieldtype": "Table",
+ "options": "Sales Order Item",
+ "permlevel": 0,
+ "print_hide": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "section_break_31",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_31",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break_33a",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_33a",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "column_break_33",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_33",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "Taxes and Charges",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "Taxes and Charges",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "oldfieldname": "charge",
- "oldfieldtype": "Link",
- "options": "Sales Taxes and Charges Template",
- "permlevel": 0,
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "oldfieldname": "charge",
+ "oldfieldtype": "Link",
+ "options": "Sales Taxes and Charges Template",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_38",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_38",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "shipping_rule",
- "fieldtype": "Link",
- "label": "Shipping Rule",
- "oldfieldtype": "Button",
- "options": "Shipping Rule",
- "permlevel": 0,
+ "fieldname": "shipping_rule",
+ "fieldtype": "Link",
+ "label": "Shipping Rule",
+ "oldfieldtype": "Button",
+ "options": "Shipping Rule",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "section_break_40",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_40",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Sales Taxes and Charges",
- "oldfieldname": "other_charges",
- "oldfieldtype": "Table",
- "options": "Sales Taxes and Charges",
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Sales Taxes and Charges",
+ "oldfieldname": "other_charges",
+ "oldfieldtype": "Table",
+ "options": "Sales Taxes and Charges",
"permlevel": 0
- },
+ },
{
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
- "permlevel": 0,
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "section_break_43",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_43",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "column_break_46",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_46",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "section_break_48",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_48",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Discount On",
- "options": "\nGrand Total\nNet Total",
- "permlevel": 0,
- "precision": "",
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "permlevel": 0,
+ "precision": "",
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_50",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_50",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency",
- "permlevel": 0,
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "description": "In Words will be visible once you save the Sales Order.",
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "description": "In Words will be visible once you save the Sales Order.",
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "50%"
- },
+ },
{
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "oldfieldname": "grand_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "oldfieldname": "grand_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "oldfieldname": "rounded_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "oldfieldname": "rounded_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "oldfieldname": "in_words_export",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "oldfieldname": "in_words_export",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "fieldname": "advance_paid",
- "fieldtype": "Currency",
- "label": "Advance Paid",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "advance_paid",
+ "fieldtype": "Currency",
+ "label": "Advance Paid",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "view_details",
- "fieldtype": "Fold",
- "label": "View Details",
+ "fieldname": "view_details",
+ "fieldtype": "Fold",
+ "label": "View Details",
"permlevel": 0
- },
+ },
{
- "description": "Display all the individual items delivered with the main items",
- "fieldname": "packing_list",
- "fieldtype": "Section Break",
- "hidden": 0,
- "label": "Packing List",
- "oldfieldtype": "Section Break",
- "options": "icon-suitcase",
- "permlevel": 0,
+ "description": "Display all the individual items delivered with the main items",
+ "fieldname": "packing_list",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "label": "Packing List",
+ "oldfieldtype": "Section Break",
+ "options": "icon-suitcase",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "packed_items",
- "fieldtype": "Table",
- "label": "Packed Items",
- "oldfieldname": "packing_details",
- "oldfieldtype": "Table",
- "options": "Packed Item",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "packed_items",
+ "fieldtype": "Table",
+ "label": "Packed Items",
+ "oldfieldname": "packing_details",
+ "oldfieldtype": "Table",
+ "options": "Packed Item",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "oldfieldtype": "Section Break",
- "options": "icon-legal",
- "permlevel": 0,
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "oldfieldtype": "Section Break",
+ "options": "icon-legal",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "print_hide": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions Details",
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions Details",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor",
+ "permlevel": 0,
"print_hide": 0
- },
+ },
{
- "depends_on": "customer",
- "fieldname": "contact_info",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "options": "icon-bullhorn",
+ "depends_on": "customer",
+ "fieldname": "contact_info",
+ "fieldtype": "Section Break",
+ "label": "Contact Info",
+ "options": "icon-bullhorn",
"permlevel": 0
- },
+ },
{
- "fieldname": "col_break45",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "col_break45",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "",
- "fieldname": "territory",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "description": "",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "description": "",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "options": "Customer Group",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
+ "description": "",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "options": "Customer Group",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "col_break46",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "col_break46",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "customer_address",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Customer Address",
- "options": "Address",
- "permlevel": 0,
+ "fieldname": "customer_address",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Customer Address",
+ "options": "Address",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Contact Person",
- "options": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Contact Person",
+ "options": "Contact",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
- "permlevel": 0,
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "description": "Track this Sales Order against any Project",
- "fieldname": "project_name",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Project Name",
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "permlevel": 0,
+ "description": "Track this Sales Order against any Project",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
+ "permlevel": 0,
"search_index": 1
- },
+ },
{
- "depends_on": "eval:doc.source == 'Campaign'",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "label": "Campaign",
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "permlevel": 0,
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "label": "Campaign",
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "source",
- "fieldtype": "Select",
- "label": "Source",
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
- "permlevel": 0,
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "label": "Source",
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 1
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "section_break_78",
- "fieldtype": "Section Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "section_break_78",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "50%"
- },
+ },
{
- "default": "Draft",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nStopped\nCancelled",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
- "search_index": 1,
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nStopped\nCancelled",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "delivery_status",
- "fieldtype": "Select",
- "hidden": 1,
- "label": "Delivery Status",
- "no_copy": 1,
- "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable",
- "permlevel": 0,
+ "fieldname": "delivery_status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "label": "Delivery Status",
+ "no_copy": 1,
+ "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "% of materials delivered against this Sales Order",
- "fieldname": "per_delivered",
- "fieldtype": "Percent",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "% Delivered",
- "no_copy": 1,
- "oldfieldname": "per_delivered",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "description": "% of materials delivered against this Sales Order",
+ "fieldname": "per_delivered",
+ "fieldtype": "Percent",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "% Delivered",
+ "no_copy": 1,
+ "oldfieldname": "per_delivered",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "column_break_81",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_81",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "% of materials billed against this Sales Order",
- "fieldname": "per_billed",
- "fieldtype": "Percent",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "% Amount Billed",
- "no_copy": 1,
- "oldfieldname": "per_billed",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "description": "% of materials billed against this Sales Order",
+ "fieldname": "per_billed",
+ "fieldtype": "Percent",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "% Amount Billed",
+ "no_copy": 1,
+ "oldfieldname": "per_billed",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "billing_status",
- "fieldtype": "Select",
- "hidden": 1,
- "label": "Billing Status",
- "no_copy": 1,
- "options": "Not Billed\nFully Billed\nPartly Billed\nClosed",
- "permlevel": 0,
+ "fieldname": "billing_status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "label": "Billing Status",
+ "no_copy": 1,
+ "options": "Not Billed\nFully Billed\nPartly Billed\nClosed",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "sales_team_section_break",
- "fieldtype": "Section Break",
- "label": "Sales Team",
- "oldfieldtype": "Section Break",
- "options": "icon-group",
- "permlevel": 0,
+ "fieldname": "sales_team_section_break",
+ "fieldtype": "Section Break",
+ "label": "Sales Team",
+ "oldfieldtype": "Section Break",
+ "options": "icon-group",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "sales_partner",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Sales Partner",
- "oldfieldname": "sales_partner",
- "oldfieldtype": "Link",
- "options": "Sales Partner",
- "permlevel": 0,
- "print_hide": 1,
- "search_index": 1,
+ "fieldname": "sales_partner",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Sales Partner",
+ "oldfieldname": "sales_partner",
+ "oldfieldtype": "Link",
+ "options": "Sales Partner",
+ "permlevel": 0,
+ "print_hide": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "column_break7",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "column_break7",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "50%"
- },
+ },
{
- "fieldname": "commission_rate",
- "fieldtype": "Float",
- "label": "Commission Rate",
- "oldfieldname": "commission_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "commission_rate",
+ "fieldtype": "Float",
+ "label": "Commission Rate",
+ "oldfieldname": "commission_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "total_commission",
- "fieldtype": "Currency",
- "label": "Total Commission",
- "oldfieldname": "total_commission",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "total_commission",
+ "fieldtype": "Currency",
+ "label": "Total Commission",
+ "oldfieldname": "total_commission",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "section_break1",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "sales_team",
- "fieldtype": "Table",
- "label": "Sales Team1",
- "oldfieldname": "sales_team",
- "oldfieldtype": "Table",
- "options": "Sales Team",
- "permlevel": 0,
+ "fieldname": "sales_team",
+ "fieldtype": "Table",
+ "label": "Sales Team1",
+ "oldfieldname": "sales_team",
+ "oldfieldtype": "Table",
+ "options": "Sales Team",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "recurring_order",
- "fieldtype": "Section Break",
- "label": "Recurring Order",
- "options": "icon-time",
+ "fieldname": "recurring_order",
+ "fieldtype": "Section Break",
+ "label": "Recurring Order",
+ "options": "icon-time",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break82",
- "fieldtype": "Column Break",
- "label": "Column Break",
+ "fieldname": "column_break82",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.docstatus<2",
- "description": "Check if recurring order, uncheck to stop recurring or put proper End Date",
- "fieldname": "is_recurring",
- "fieldtype": "Check",
- "label": "Is Recurring",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.docstatus<2",
+ "description": "Check if recurring order, uncheck to stop recurring or put proper End Date",
+ "fieldname": "is_recurring",
+ "fieldtype": "Check",
+ "label": "Is Recurring",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Select the period when the invoice will be generated automatically",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Select the period when the invoice will be generated automatically",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Start date of current order's period",
- "fieldname": "from_date",
- "fieldtype": "Date",
- "label": "From Date",
- "no_copy": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Start date of current order's period",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date",
+ "no_copy": 1,
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "End date of current order's period",
- "fieldname": "to_date",
- "fieldtype": "Date",
- "label": "To Date",
- "no_copy": 1,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "End date of current order's period",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date",
+ "no_copy": 1,
"permlevel": 0
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc ",
- "fieldname": "repeat_on_day_of_month",
- "fieldtype": "Int",
- "label": "Repeat on Day of Month",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc ",
+ "fieldname": "repeat_on_day_of_month",
+ "fieldtype": "Int",
+ "label": "Repeat on Day of Month",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which recurring order will be stop",
- "fieldname": "end_date",
- "fieldtype": "Date",
- "label": "End Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which recurring order will be stop",
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "label": "End Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break83",
- "fieldtype": "Column Break",
- "label": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break83",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which next invoice will be generated. It is generated on submit.",
- "fieldname": "next_date",
- "fieldtype": "Date",
- "label": "Next Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which next invoice will be generated. It is generated on submit.",
+ "fieldname": "next_date",
+ "fieldtype": "Date",
+ "label": "Next Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "fieldname": "recurring_id",
- "fieldtype": "Data",
- "label": "Recurring Id",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_id",
+ "fieldtype": "Data",
+ "label": "Recurring Id",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Enter email id separated by commas, order will be mailed automatically on particular date",
- "fieldname": "notification_email_address",
- "fieldtype": "Small Text",
- "ignore_user_permissions": 0,
- "label": "Notification Email Address",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Enter email id separated by commas, order will be mailed automatically on particular date",
+ "fieldname": "notification_email_address",
+ "fieldtype": "Small Text",
+ "ignore_user_permissions": 0,
+ "label": "Notification Email Address",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
+ },
+ {
+ "depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_print_format",
+ "fieldtype": "Link",
+ "label": "Recurring Print Format",
+ "options": "Print Format",
+ "permlevel": 0,
+ "precision": ""
}
- ],
- "icon": "icon-file-text",
- "idx": 1,
- "is_submittable": 1,
- "issingle": 0,
- "modified": "2015-04-28 15:27:40.852417",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Sales Order",
- "owner": "Administrator",
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
+ "is_submittable": 1,
+ "issingle": 0,
+ "modified": "2015-07-13 05:28:26.889049",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Sales Order",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "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,
- "export": 1,
- "import": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Manager",
- "set_user_permissions": 1,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "import": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Manager",
+ "set_user_permissions": 1,
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Maintenance User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Maintenance User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "cancel": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
"role": "Accounts User"
- },
+ },
{
- "apply_user_permissions": 1,
- "cancel": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
"role": "Customer"
- },
+ },
{
- "apply_user_permissions": 1,
- "permlevel": 0,
- "read": 1,
- "report": 1,
- "role": "Material User"
- },
+ "apply_user_permissions": 1,
+ "permlevel": 0,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User"
+ },
{
- "permlevel": 1,
- "read": 1,
- "role": "Sales Manager",
+ "permlevel": 1,
+ "read": 1,
+ "role": "Sales Manager",
"write": 1
}
- ],
- "read_only_onload": 1,
- "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only_onload": 1,
+ "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index feffc4f..e8a772a 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -39,8 +39,8 @@
for d in self.get('items'):
check_list.append(cstr(d.item_code))
- if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 'Yes':
- if not d.warehouse:
+ if (frappe.db.get_value("Item", d.item_code, "is_stock_item") == 'Yes' or
+ self.has_product_bundle(d.item_code)) and not d.warehouse:
frappe.throw(_("Reserved warehouse required for stock item {0}").format(d.item_code))
# used for production plan
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 085d0e8..e0c75b6 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -14,7 +14,6 @@
return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"];
}
},
- order_by: "per_delivered asc, modified desc",
onload: function(listview) {
var method = "erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders";
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 0565341..59e58b0 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -125,7 +125,7 @@
existing_reserved_qty_item1 = get_reserved_qty("_Test Item")
existing_reserved_qty_item2 = get_reserved_qty("_Test Item Home Desktop 100")
- so = make_sales_order(item_code="_Test Sales BOM Item")
+ so = make_sales_order(item_code="_Test Product Bundle Item")
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 50)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
@@ -164,12 +164,12 @@
def test_reserved_qty_for_over_delivery_with_packing_list(self):
# set over-delivery tolerance
- frappe.db.set_value('Item', "_Test Sales BOM Item", 'tolerance', 50)
+ frappe.db.set_value('Item', "_Test Product Bundle Item", 'tolerance', 50)
existing_reserved_qty_item1 = get_reserved_qty("_Test Item")
existing_reserved_qty_item2 = get_reserved_qty("_Test Item Home Desktop 100")
- so = make_sales_order(item_code="_Test Sales BOM Item")
+ so = make_sales_order(item_code="_Test Product Bundle Item")
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 50)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
@@ -192,11 +192,11 @@
frappe.permissions.add_user_permission("Company", "_Test Company 1", "test2@example.com")
test_user = frappe.get_doc("User", "test@example.com")
- test_user.add_roles("Sales User", "Material User")
+ test_user.add_roles("Sales User", "Stock User")
test_user.remove_roles("Sales Manager")
test_user_2 = frappe.get_doc("User", "test2@example.com")
- test_user_2.add_roles("Sales User", "Material User")
+ test_user_2.add_roles("Sales User", "Stock User")
test_user_2.remove_roles("Sales Manager")
frappe.set_user("test@example.com")
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 a0c8c2a..8012bba 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -58,7 +58,7 @@
"fieldname": "description",
"fieldtype": "Small Text",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -127,10 +127,11 @@
"width": "70px"
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount(%)",
+ "label": "Discount on Price List Rate (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
"permlevel": 0,
@@ -310,7 +311,7 @@
"fieldname": "warehouse",
"fieldtype": "Link",
"in_list_view": 1,
- "label": "Reserved Warehouse",
+ "label": "Delivery Warehouse",
"no_copy": 0,
"oldfieldname": "reserved_warehouse",
"oldfieldtype": "Link",
@@ -497,7 +498,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:51:46.978580",
+ "modified": "2015-07-02 05:37:29.289574",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json
index e3b4243..c966ef3 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@@ -37,6 +37,15 @@
"permlevel": 0
},
{
+ "depends_on": "eval:doc.send_to=='All Sales Partner Contact'",
+ "fieldname": "sales_partner",
+ "fieldtype": "Link",
+ "label": "Sales Partner",
+ "options": "Sales Partner",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"depends_on": "eval:doc.send_to=='All Employee (Active)'",
"fieldname": "department",
"fieldtype": "Link",
@@ -108,7 +117,7 @@
"idx": 1,
"in_create": 0,
"issingle": 1,
- "modified": "2015-02-05 05:11:46.773913",
+ "modified": "2015-05-25 17:46:37.555503",
"modified_by": "Administrator",
"module": "Selling",
"name": "SMS Center",
diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js
index 3b9e25a..98d34be 100644
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -122,7 +122,7 @@
if(me.ctype == "Sales Person") {
fields.splice(-1, 0, {fieldtype:'Link', fieldname:'employee', label:__('Employee'),
- options:'Employee', description: __("Please enter Employee Id of this sales parson")});
+ options:'Employee', description: __("Please enter Employee Id of this sales person")});
}
// the dialog
diff --git a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json
index 30b5d84..52da750 100644
--- a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json
+++ b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json
@@ -5,12 +5,12 @@
"doctype": "Report",
"idx": 1,
"is_standard": "Yes",
- "modified": "2014-06-03 07:18:16.914298",
+ "modified": "2015-07-06 06:11:10.534423",
"modified_by": "Administrator",
"module": "Selling",
"name": "Available Stock for Packing Items",
"owner": "Administrator",
- "ref_doctype": "Sales BOM",
+ "ref_doctype": "Product Bundle",
"report_name": "Available Stock for Packing Items",
"report_type": "Script Report"
}
\ No newline at end of file
diff --git a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
index f1633e7..40ed20c 100644
--- a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
+++ b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
@@ -39,9 +39,9 @@
return columns
-def get_sales_bom_items():
+def get_product_bundle_items():
sbom_item_map = {}
- for sbom in frappe.db.sql("""select parent, item_code, qty from `tabSales BOM Item`
+ for sbom in frappe.db.sql("""select parent, item_code, qty from `tabProduct Bundle Item`
where docstatus < 2""", as_dict=1):
sbom_item_map.setdefault(sbom.parent, {}).setdefault(sbom.item_code, sbom.qty)
@@ -67,7 +67,7 @@
def get_item_warehouse_quantity_map():
sbom_map = {}
iwq_map = get_item_warehouse_quantity()
- sbom_item_map = get_sales_bom_items()
+ sbom_item_map = get_product_bundle_items()
for sbom, sbom_items in sbom_item_map.items():
for item, child_qty in sbom_items.items():
diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
index e975e9f..6d00b82 100644
--- a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
+++ b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
@@ -8,6 +8,13 @@
"label": __("Days Since Last Order"),
"fieldtype": "Int",
"default": 60
+ },
+ {
+ "fieldname":"doctype",
+ "label": __("Doctype"),
+ "fieldtype": "Select",
+ "default": "Sales Order",
+ "options": "Sales Order\nSales Invoice"
}
]
}
\ No newline at end of file
diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
index 2b2c550..86186aa 100644
--- a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
+++ b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
@@ -10,41 +10,51 @@
if not filters: filters ={}
days_since_last_order = filters.get("days_since_last_order")
+ doctype = filters.get("doctype")
+
if cint(days_since_last_order) <= 0:
frappe.throw(_("'Days Since Last Order' must be greater than or equal to zero"))
columns = get_columns()
- customers = get_so_details()
+ customers = get_sales_details(doctype)
data = []
for cust in customers:
if cint(cust[8]) >= cint(days_since_last_order):
- cust.insert(7,get_last_so_amt(cust[0]))
+ cust.insert(7,get_last_sales_amt(cust[0], doctype))
data.append(cust)
return columns, data
-def get_so_details():
+def get_sales_details(doctype):
+ cond = """sum(so.base_net_total) as 'total_order_considered',
+ max(so.posting_date) as 'last_order_date',
+ DATEDIFF(CURDATE(), max(so.posting_date)) as 'days_since_last_order' """
+ if doctype == "Sales Order":
+ cond = """sum(if(so.status = "Stopped",
+ so.base_net_total * so.per_delivered/100,
+ so.base_net_total)) as 'total_order_considered',
+ max(so.transaction_date) as 'last_order_date',
+ DATEDIFF(CURDATE(), max(so.transaction_date)) as 'days_since_last_order'"""
+
return frappe.db.sql("""select
cust.name,
cust.customer_name,
cust.territory,
cust.customer_group,
count(distinct(so.name)) as 'num_of_order',
- sum(base_net_total) as 'total_order_value',
- sum(if(so.status = "Stopped",
- so.base_net_total * so.per_delivered/100,
- so.base_net_total)) as 'total_order_considered',
- max(so.transaction_date) as 'last_sales_order_date',
- DATEDIFF(CURDATE(), max(so.transaction_date)) as 'days_since_last_order'
- from `tabCustomer` cust, `tabSales Order` so
+ sum(base_net_total) as 'total_order_value', {0}
+ from `tabCustomer` cust, `tab{1}` so
where cust.name = so.customer and so.docstatus = 1
group by cust.name
- order by 'days_since_last_order' desc """,as_list=1)
+ order by 'days_since_last_order' desc """.format(cond, doctype), as_list=1)
-def get_last_so_amt(customer):
- res = frappe.db.sql("""select base_net_total from `tabSales Order`
- where customer ='%(customer)s' and docstatus = 1 order by transaction_date desc
- limit 1""" % {'customer': frappe.db.escape(customer)})
+def get_last_sales_amt(customer, doctype):
+ cond = "posting_date"
+ if doctype =="Sales Order":
+ cond = "transaction_date"
+ res = frappe.db.sql("""select base_net_total from `tab{0}`
+ where customer = %s and docstatus = 1 order by {1} desc
+ limit 1""".format(doctype, cond), customer)
return res and res[0][0] or 0
@@ -58,6 +68,6 @@
_("Total Order Value") + ":Currency:120",
_("Total Order Considered") + ":Currency:160",
_("Last Order Amount") + ":Currency:160",
- _("Last Sales Order Date") + ":Date:160",
+ _("Last Order Date") + ":Date:160",
_("Days Since Last Order") + "::160"
]
diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
index 5bac1c5..f7aa70f 100644
--- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
+++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
@@ -72,7 +72,7 @@
target_details = {}
for d in frappe.db.sql("""select md.name, mdp.month, mdp.percentage_allocation
- from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` mdp
+ from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
where mdp.parent=md.name and md.fiscal_year=%s""", (filters["fiscal_year"]), as_dict=1):
target_details.setdefault(d.name, {}).setdefault(d.month, flt(d.percentage_allocation))
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
index 0dee7ab..65b0c08 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
@@ -34,7 +34,7 @@
def get_entries(filters):
date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date"
- conditions, items = get_conditions(filters, date_field)
+ conditions, values = get_conditions(filters, date_field)
entries = frappe.db.sql("""select dt.name, dt.customer, dt.territory, dt.%s as posting_date,
dt_item.item_code, dt_item.qty, dt_item.base_net_amount, st.sales_person,
st.allocated_percentage, dt_item.base_net_amount*st.allocated_percentage/100 as contribution_amt
@@ -42,31 +42,37 @@
where st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s
and dt.docstatus = 1 %s order by st.sales_person, dt.name desc""" %
(date_field, filters["doc_type"], filters["doc_type"], '%s', conditions),
- tuple([filters["doc_type"]] + items), as_dict=1)
+ tuple([filters["doc_type"]] + values), as_dict=1)
return entries
def get_conditions(filters, date_field):
- conditions = ""
- if filters.get("company"): conditions += " and dt.company = '%s'" % \
- filters["company"].replace("'", "\'")
- if filters.get("customer"): conditions += " and dt.customer = '%s'" % \
- filters["customer"].replace("'", "\'")
- if filters.get("territory"): conditions += " and dt.territory = '%s'" % \
- filters["territory"].replace("'", "\'")
-
- if filters.get("from_date"): conditions += " and dt.%s >= '%s'" % \
- (date_field, filters["from_date"])
- if filters.get("to_date"): conditions += " and dt.%s <= '%s'" % (date_field, filters["to_date"])
-
- if filters.get("sales_person"): conditions += " and st.sales_person = '%s'" % \
- filters["sales_person"].replace("'", "\'")
+ conditions = [""]
+ values = []
+
+ for field in ["company", "customer", "territory"]:
+ if filters.get(field):
+ conditions.append("dt.{0}=%s".format(field))
+ values.append(filters[field])
+
+ if filters.get("sales_person"):
+ conditions.append("st.sales_person=%s")
+ values.append(filters["sales_person"])
+
+ if filters.get("from_date"):
+ conditions.append("dt.{0}>=%s".format(date_field))
+ values.append(filters["from_date"])
+
+ if filters.get("to_date"):
+ conditions.append("dt.{0}<=%s".format(date_field))
+ values.append(filters["to_date"])
items = get_items(filters)
if items:
- conditions += " and dt_item.item_code in (%s)" % ', '.join(['%s']*len(items))
+ conditions.append("dt_item.item_code in (%s)" % ', '.join(['%s']*len(items)))
+ values += items
- return conditions, items
+ return " and ".join(conditions), values
def get_items(filters):
if filters.get("item_group"): key = "item_group"
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 1e4ec7f..f3cd8a7 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -71,7 +71,7 @@
} else {
filters = {
'item_code': item.item_code,
- 'posting_date': me.frm.doc.posting_date,
+ 'posting_date': me.frm.doc.posting_date || nowdate(),
}
if(item.warehouse) filters["warehouse"] = item.warehouse
@@ -112,10 +112,6 @@
erpnext.utils.get_address_display(this.frm, "shipping_address_name", "shipping_address");
},
- contact_person: function() {
- erpnext.utils.get_contact_details(this.frm);
- },
-
sales_partner: function() {
this.apply_pricing_rule();
},
@@ -124,10 +120,6 @@
this.apply_pricing_rule();
},
- barcode: function(doc, cdt, cdn) {
- this.item_code(doc, cdt, cdn);
- },
-
selling_price_list: function() {
this.apply_price_list();
},
@@ -299,27 +291,27 @@
set_dynamic_labels: function() {
this._super();
- this.set_sales_bom_help(this.frm.doc);
+ this.set_product_bundle_help(this.frm.doc);
},
- set_sales_bom_help: function(doc) {
+ set_product_bundle_help: function(doc) {
if(!cur_frm.fields_dict.packing_list) return;
if ((doc.packed_items || []).length) {
$(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true);
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
help_msg = "<div class='alert alert-warning'>" +
- __("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.")+
+ __("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.")+
"</div>";
- frappe.meta.get_docfield(doc.doctype, 'sales_bom_help', doc.name).options = help_msg;
+ frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = help_msg;
}
} else {
$(cur_frm.fields_dict.packing_list.row.wrapper).toggle(false);
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
- frappe.meta.get_docfield(doc.doctype, 'sales_bom_help', doc.name).options = '';
+ frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = '';
}
}
- refresh_field('sales_bom_help');
+ refresh_field('product_bundle_help');
}
});
diff --git a/erpnext/setup/doctype/backup_manager/backup_dropbox.py b/erpnext/setup/doctype/backup_manager/backup_dropbox.py
index c6862d2..9e38833 100644
--- a/erpnext/setup/doctype/backup_manager/backup_dropbox.py
+++ b/erpnext/setup/doctype/backup_manager/backup_dropbox.py
@@ -48,6 +48,7 @@
frappe.db.set_value("Backup Manager", "Backup Manager", "dropbox_access_key", access_token.key)
frappe.db.set_value("Backup Manager", "Backup Manager", "dropbox_access_secret", access_token.secret)
frappe.db.set_value("Backup Manager", "Backup Manager", "dropbox_access_allowed", allowed)
+ frappe.db.set_value("Backup Manager", "Backup Manager", "send_backups_to_dropbox", 1)
dropbox_client = client.DropboxClient(sess)
try:
dropbox_client.file_create_folder("files")
diff --git a/erpnext/setup/doctype/backup_manager/backup_files_list.html b/erpnext/setup/doctype/backup_manager/backup_files_list.html
new file mode 100644
index 0000000..5ee52ef
--- /dev/null
+++ b/erpnext/setup/doctype/backup_manager/backup_files_list.html
@@ -0,0 +1,30 @@
+<table class="table table-striped" style="max-width: 600px;">
+ <thead>
+ <tr>
+ <th style="width: 30%;">
+ {{ __("Date") }}
+ </th>
+ <th style="width: 50%;">
+ {{ __("File") }}
+ </th>
+ <th>
+ {{ __("Size") }}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for (var i=0; i < files.length; i++) { %}
+ <tr>
+ <td>
+ {{ files[i][1] }}
+ </td>
+ <td>
+ <a href="{{ files[i][0] }}" target="_blank">{{ files[i][0] }}</a>
+ </td>
+ <td>
+ {{ files[i][2] }}
+ </td>
+ </tr>
+ {% } %}
+ </tbody>
+</table>
diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.js b/erpnext/setup/doctype/backup_manager/backup_manager.js
index 6f4ec6b..cb4104a 100644
--- a/erpnext/setup/doctype/backup_manager/backup_manager.js
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.js
@@ -2,35 +2,16 @@
// License: GNU General Public License v3. See license.txt
$.extend(cur_frm.cscript, {
+ onload_post_render: function() {
+ cur_frm.fields_dict.allow_dropbox_access.$input.addClass("btn-primary");
+
+ if(cur_frm.doc.__onload && cur_frm.doc.__onload.files) {
+ $(frappe.render_template("backup_files_list", {files:cur_frm.doc.__onload.files}))
+ .appendTo(cur_frm.fields_dict.current_backups.$wrapper.empty());
+ }
+ },
refresh: function() {
cur_frm.disable_save();
-
- if(!(cint(cur_frm.doc.dropbox_access_allowed) ||
- cint(cur_frm.doc.gdrive_access_allowed))) {
- cur_frm.set_intro(__("You can start by selecting backup frequency and granting access for sync"));
- } else {
- var services = {
- "dropbox": __("Dropbox")
- // "gdrive": __("Google Drive")
- }
- var active_services = [];
-
- $.each(services, function(service, label) {
- var access_allowed = cint(cur_frm.doc[service + "_access_allowed"]);
- var frequency = cur_frm.doc["upload_backups_to_" + service];
- if(access_allowed && frequency && frequency !== "Never") {
- active_services.push(label + " [" + frequency + "]");
- }
- });
-
- if(active_services.length > 0) {
- cur_frm.set_intro(__("Backups will be uploaded to") + ": " +
- frappe.utils.comma_and(active_services));
- } else {
- cur_frm.set_intro("");
- }
- }
-
},
validate_send_notifications_to: function() {
diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.json b/erpnext/setup/doctype/backup_manager/backup_manager.json
index e8840d5..7aa038e 100644
--- a/erpnext/setup/doctype/backup_manager/backup_manager.json
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.json
@@ -8,16 +8,22 @@
{
"fieldname": "setup",
"fieldtype": "Section Break",
- "label": "Setup",
+ "label": "Download Backups",
"permlevel": 0
},
{
- "description": "Email ids separated by commas.",
- "fieldname": "send_notifications_to",
- "fieldtype": "Data",
- "label": "Send Notifications To",
+ "fieldname": "current_backups",
+ "fieldtype": "HTML",
+ "label": "Current Backups",
"permlevel": 0,
- "reqd": 1
+ "precision": ""
+ },
+ {
+ "description": "",
+ "fieldname": "sync_with_dropbox",
+ "fieldtype": "Section Break",
+ "label": "Sync with Dropbox",
+ "permlevel": 0
},
{
"fieldname": "backup_right_now",
@@ -28,13 +34,15 @@
"read_only": 1
},
{
- "description": "Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.",
- "fieldname": "sync_with_dropbox",
- "fieldtype": "Section Break",
- "label": "Sync with Dropbox",
- "permlevel": 0
+ "fieldname": "send_backups_to_dropbox",
+ "fieldtype": "Check",
+ "label": "Send Backups to Dropbox",
+ "permlevel": 0,
+ "precision": ""
},
{
+ "depends_on": "send_backups_to_dropbox",
+ "description": "Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.",
"fieldname": "upload_backups_to_dropbox",
"fieldtype": "Select",
"label": "Upload Backups to Dropbox",
@@ -42,6 +50,15 @@
"permlevel": 0
},
{
+ "depends_on": "send_backups_to_dropbox",
+ "description": "Email ids separated by commas.",
+ "fieldname": "send_notifications_to",
+ "fieldtype": "Data",
+ "label": "Send Notifications To",
+ "permlevel": 0,
+ "reqd": 0
+ },
+ {
"fieldname": "dropbox_access_key",
"fieldtype": "Data",
"hidden": 1,
@@ -66,6 +83,7 @@
"read_only": 1
},
{
+ "depends_on": "send_backups_to_dropbox",
"fieldname": "allow_dropbox_access",
"fieldtype": "Button",
"label": "Allow Dropbox Access",
@@ -140,7 +158,7 @@
"icon": "icon-cloud-upload",
"idx": 1,
"issingle": 1,
- "modified": "2015-02-05 05:11:34.700674",
+ "modified": "2015-05-26 04:54:10.193573",
"modified_by": "Administrator",
"module": "Setup",
"name": "Backup Manager",
diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.py b/erpnext/setup/doctype/backup_manager/backup_manager.py
index 4a38a6a..8d9d48f 100644
--- a/erpnext/setup/doctype/backup_manager/backup_manager.py
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.py
@@ -4,13 +4,36 @@
# For license information, please see license.txt
from __future__ import unicode_literals
+from frappe.utils import get_site_path
+from frappe.utils.data import convert_utc_to_user_timezone
+import os
+import datetime
import frappe
-from frappe import _
from frappe.model.document import Document
class BackupManager(Document):
- pass
+ def onload(self):
+ self.set_onload("files", get_files())
+
+def get_files():
+ def get_time(path):
+ dt = os.path.getmtime(path)
+ return convert_utc_to_user_timezone(datetime.datetime.utcfromtimestamp(dt)).strftime('%Y-%m-%d %H:%M')
+
+ def get_size(path):
+ size = os.path.getsize(path)
+ if size > 1048576:
+ return "{0:.1f}M".format(float(size) / 1048576)
+ else:
+ return "{0:.1f}K".format(float(size) / 1024)
+
+ path = get_site_path('private', 'backups')
+ files = [x for x in os.listdir(path) if os.path.isfile(os.path.join(path, x))]
+ files = [('/backups/' + _file,
+ get_time(os.path.join(path, _file)),
+ get_size(os.path.join(path, _file))) for _file in files]
+ return files
def take_backups_daily():
take_backups_if("Daily")
@@ -19,11 +42,12 @@
take_backups_if("Weekly")
def take_backups_if(freq):
- if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox")==freq:
- take_backups_dropbox()
+ if frappe.db.get_value("Backup Manager", None, "send_backups_to_dropbox"):
+ if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox")==freq:
+ take_backups_dropbox()
- # if frappe.db.get_value("Backup Manager", None, "upload_backups_to_gdrive")==freq:
- # take_backups_gdrive()
+ # if frappe.db.get_value("Backup Manager", None, "upload_backups_to_gdrive")==freq:
+ # take_backups_gdrive()
@frappe.whitelist()
def take_backups_dropbox():
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 2b20b10..288bdd7 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -33,7 +33,7 @@
"icon": "icon-certificate",
"idx": 1,
"in_dialog": 0,
- "modified": "2015-02-05 05:11:35.319683",
+ "modified": "2015-07-13 05:28:24.597639",
"modified_by": "Administrator",
"module": "Setup",
"name": "Brand",
@@ -47,7 +47,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"write": 1
},
@@ -61,7 +61,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
},
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 817fdb6..e8e2e73 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -4,6 +4,10 @@
frappe.provide("erpnext.company");
frappe.ui.form.on("Company", {
+ onload: function(frm) {
+ erpnext.company.setup_queries(frm);
+ },
+
onload_post_render: function(frm) {
frm.get_field("delete_company_transactions").$input.addClass("btn-danger");
},
@@ -11,31 +15,37 @@
erpnext.company.set_chart_of_accounts_options(frm.doc);
},
delete_company_transactions: function(frm) {
- var d = frappe.prompt({
- fieldtype:"Data",
- fieldname: "company_name",
- label: __("Please re-type company name to confirm"),
- reqd: 1,
- description: __("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.")},
- function(data) {
- if(data.company_name !== frm.doc.name) {
- frappe.msgprint("Company name not same");
- return;
- }
- frappe.call({
- method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
- args: {
- company_name: data.company_name
- },
- freeze: true,
- callback: function(r, rt) {
- if(!r.exc)
- frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
+ frappe.verify_password(function() {
+ var d = frappe.prompt({
+ fieldtype:"Data",
+ fieldname: "company_name",
+ label: __("Please re-type company name to confirm"),
+ reqd: 1,
+ description: __("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.")},
+ function(data) {
+ if(data.company_name !== frm.doc.name) {
+ frappe.msgprint("Company name not same");
+ return;
}
- });
- }, __("Delete all the Transactions for this Company"), __("Delete"));
-
- d.get_primary_btn().addClass("btn-danger");
+ frappe.call({
+ method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
+ args: {
+ company_name: data.company_name
+ },
+ freeze: true,
+ callback: function(r, rt) {
+ if(!r.exc)
+ frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
+ },
+ onerror: function() {
+ frappe.msgprint(__("Wrong Password"));
+ }
+ });
+ }, __("Delete all the Transactions for this Company"), __("Delete")
+ );
+ d.get_primary_btn().addClass("btn-danger");
+ }
+ );
}
});
@@ -108,98 +118,43 @@
dialog.show();
}
-cur_frm.fields_dict.default_bank_account.get_query = function(doc) {
- return{
- filters: [
- ['Account', 'account_type', '=', 'Bank'],
- ['Account', 'is_group', '=', 0],
- ['Account', 'company', '=', doc.name]
- ]
+erpnext.company.setup_queries = function(frm) {
+ $.each([
+ ["default_bank_account", {"account_type": "Bank"}],
+ ["default_cash_account", {"account_type": "Cash"}],
+ ["default_receivable_account", {"account_type": "Receivable"}],
+ ["default_payable_account", {"account_type": "Payable"}],
+ ["default_expense_account", {"root_type": "Expense"}],
+ ["default_income_account", {"root_type": "Income"}],
+ ["round_off_account", {"root_type": "Expense"}],
+ ["cost_center", {}],
+ ["round_off_cost_center", {}]
+ ], function(i, v) {
+ erpnext.company.set_custom_query(frm, v);
+ });
+
+ if (sys_defaults.auto_accounting_for_stock) {
+ $.each([
+ ["stock_adjustment_account", {"root_type": "Expense"}],
+ ["expenses_included_in_valuation", {"root_type": "Expense"}],
+ ["stock_received_but_not_billed", {"report_type": "Balance Sheet"}]
+ ], function(i, v) {
+ erpnext.company.set_custom_query(frm, v);
+ });
}
}
-cur_frm.fields_dict.default_cash_account.get_query = function(doc) {
- return{
- filters: [
- ['Account', 'account_type', '=', 'Cash'],
- ['Account', 'is_group', '=', 0],
- ['Account', 'company', '=', doc.name]
- ]
- }
-}
+erpnext.company.set_custom_query = function(frm, v) {
+ var filters = {
+ "company": frm.doc.name,
+ "is_group": 0
+ };
+ for (var key in v[1])
+ filters[key] = v[1][key];
-cur_frm.fields_dict.default_receivable_account.get_query = function(doc) {
- return{
- filters:{
- 'company': doc.name,
- "is_group": 0,
- "account_type": "Receivable"
- }
- }
-}
-
-cur_frm.fields_dict.default_payable_account.get_query = function(doc) {
- return{
- filters:{
- 'company': doc.name,
- "is_group": 0,
- "account_type": "Payable"
- }
- }
-}
-
-
-
-cur_frm.fields_dict.default_expense_account.get_query = function(doc) {
- return{
- filters:{
- 'company': doc.name,
- "is_group": 0,
- "report_type": "Profit and Loss"
- }
- }
-}
-
-cur_frm.fields_dict.default_income_account.get_query = function(doc) {
- return{
- filters:{
- 'company': doc.name,
- "is_group": 0,
- "report_type": "Profit and Loss"
- }
- }
-}
-
-cur_frm.fields_dict.cost_center.get_query = function(doc) {
- return{
- filters:{
- 'company': doc.name,
- "is_group": 0,
- }
- }
-}
-
-if (sys_defaults.auto_accounting_for_stock) {
- cur_frm.fields_dict["stock_adjustment_account"].get_query = function(doc) {
+ frm.set_query(v[0], function() {
return {
- "filters": {
- "report_type": "Profit and Loss",
- "company": doc.name,
- "is_group": 0
- }
- }
- }
-
- cur_frm.fields_dict["expenses_included_in_valuation"].get_query =
- cur_frm.fields_dict["stock_adjustment_account"].get_query;
-
- cur_frm.fields_dict["stock_received_but_not_billed"].get_query = function(doc) {
- return {
- "filters": {
- "report_type": "Balance Sheet",
- "company": doc.name,
- "is_group": 0
- }
- }
- }
-}
+ filters: filters
+ };
+ });
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index db71d0f..09b033e 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -171,6 +171,15 @@
"read_only": 0
},
{
+ "fieldname": "round_off_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 0,
+ "label": "Round Off Account",
+ "options": "Account",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "column_break0",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -212,6 +221,15 @@
"permlevel": 0
},
{
+ "fieldname": "round_off_cost_center",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 0,
+ "label": "Round Off Cost Center",
+ "options": "Cost Center",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "section_break_22",
"fieldtype": "Section Break",
"permlevel": 0,
@@ -228,7 +246,15 @@
"permlevel": 0
},
{
- "depends_on": "eval:!doc.__islocal",
+ "fieldname": "credit_days_based_on",
+ "fieldtype": "Select",
+ "label": "Credit Days Based On",
+ "options": "\nFixed Days\nLast Day of the Next Month",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')",
"fieldname": "credit_days",
"fieldtype": "Int",
"label": "Credit Days",
@@ -414,7 +440,7 @@
],
"icon": "icon-building",
"idx": 1,
- "modified": "2015-05-19 02:00:41.055138",
+ "modified": "2015-07-14 02:23:45.064575",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
@@ -441,7 +467,72 @@
"permlevel": 0,
"print": 1,
"read": 1,
- "role": "All"
+ "role": "Accounts User"
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Sales User",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Stock User",
+ "share": 0,
+ "write": 0
+ },
+ {
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Projects User",
+ "share": 0,
+ "write": 0
}
]
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index d358928..f1f7cc4 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -27,8 +27,12 @@
return exists
def validate(self):
+ self.abbr = self.abbr.strip()
if self.get('__islocal') and len(self.abbr) > 5:
frappe.throw(_("Abbreviation cannot have more than 5 characters"))
+
+ if not self.abbr.strip():
+ frappe.throw(_("Abbr can not be blank or space"))
self.previous_default_currency = frappe.db.get_value("Company", self.name, "default_currency")
if self.default_currency and self.previous_default_currency and \
@@ -110,6 +114,7 @@
def set_default_accounts(self):
self._set_default_account("default_cash_account", "Cash")
self._set_default_account("default_bank_account", "Bank")
+ self._set_default_account("round_off_account", "Round Off")
if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")):
self._set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
@@ -157,6 +162,7 @@
cc_doc.insert()
frappe.db.set(self, "cost_center", _("Main") + " - " + self.abbr)
+ frappe.db.set(self, "round_off_cost_center", _("Main") + " - " + self.abbr)
def before_rename(self, olddn, newdn, merge=False):
if merge:
@@ -174,6 +180,10 @@
"""
Trash accounts and cost centers for this company if no gl entry exists
"""
+ accounts = frappe.db.sql_list("select name from tabAccount where company=%s", self.name)
+ cost_centers = frappe.db.sql_list("select name from `tabCost Center` where company=%s", self.name)
+ warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name)
+
rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name)
if not rec:
# delete Account
@@ -192,23 +202,43 @@
frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name)
frappe.defaults.clear_default("company", value=self.name)
+
+ # clear default accounts, warehouses from item
+ for f in ["default_warehouse", "website_warehouse"]:
+ frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
+ % (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses))
+
+ frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)"""
+ % ', '.join(['%s']*len(warehouses)), tuple(warehouses))
+
+ for f in ["income_account", "expense_account"]:
+ frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
+ % (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
+
+ for f in ["selling_cost_center", "buying_cost_center"]:
+ frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
+ % (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
+ # reset default company
frappe.db.sql("""update `tabSingles` set value=""
where doctype='Global Defaults' and field='default_company'
and value=%s""", self.name)
@frappe.whitelist()
def replace_abbr(company, old, new):
+ new = new.strip()
+ if not new:
+ frappe.throw(_("Abbr can not be blank or space"))
+
frappe.only_for("System Manager")
frappe.db.set_value("Company", company, "abbr", new)
def _rename_record(dt):
for d in frappe.db.sql("select name from `tab%s` where company=%s" % (dt, '%s'), company):
- parts = d[0].split(" - ")
- if parts[-1].lower() == old.lower():
- name_without_abbr = " - ".join(parts[:-1])
- frappe.rename_doc(dt, d[0], name_without_abbr + " - " + new)
+ parts = d[0].rsplit(" - ", 1)
+ if len(parts) == 1 or parts[1].lower() == old.lower():
+ frappe.rename_doc(dt, d[0], parts[0] + " - " + new)
for dt in ["Account", "Cost Center", "Warehouse"]:
_rename_record(dt)
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index f27ba86..87c1375 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -27,12 +27,7 @@
company_fieldname = meta.get("fields", {"fieldtype": "Link",
"options": "Company"})[0].fieldname
- if meta.issingle:
- single = frappe.get_doc(doctype, doctype)
- single.set(company_fieldname, "")
- single.flags.ignore_mandatory = True
- single.save()
- else:
+ if not meta.issingle:
if not meta.istable:
# delete children
for df in meta.get_table_fields():
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index c6ea98c..732e465 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -57,6 +57,15 @@
"permlevel": 0
},
{
+ "fieldname": "credit_days_based_on",
+ "fieldtype": "Select",
+ "label": "Credit Days Based On",
+ "options": "\nFixed Days\nLast Day of the Next Month",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'",
"fieldname": "credit_days",
"fieldtype": "Int",
"label": "Credit Days",
@@ -128,7 +137,7 @@
"icon": "icon-sitemap",
"idx": 1,
"in_create": 0,
- "modified": "2015-02-24 17:34:40.749511",
+ "modified": "2015-07-09 12:43:18.846143",
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",
diff --git a/erpnext/setup/doctype/features_setup/features_setup.json b/erpnext/setup/doctype/features_setup/features_setup.json
index 590a73e..edc88e2 100644
--- a/erpnext/setup/doctype/features_setup/features_setup.json
+++ b/erpnext/setup/doctype/features_setup/features_setup.json
@@ -26,7 +26,7 @@
"permlevel": 0
},
{
- "description": "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",
+ "description": "To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",
"fieldname": "fs_brands",
"fieldtype": "Check",
"in_list_view": 1,
@@ -205,7 +205,7 @@
"icon": "icon-glass",
"idx": 1,
"issingle": 1,
- "modified": "2015-02-05 05:11:38.842809",
+ "modified": "2015-07-06 06:11:10.534423",
"modified_by": "Administrator",
"module": "Setup",
"name": "Features Setup",
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index 777ae3b..c7330d0 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -66,20 +66,6 @@
"label": "Disable Rounded Total",
"permlevel": 0,
"read_only": 0
- },
- {
- "fieldname": "section_break_8",
- "fieldtype": "Section Break",
- "permlevel": 0,
- "precision": ""
- },
- {
- "description": "For automatic exchange rates go to jsonrates.com and signup for an API key",
- "fieldname": "jsonrates_api_key",
- "fieldtype": "Data",
- "label": "jsonrates.com API Key",
- "permlevel": 0,
- "precision": ""
}
],
"hide_toolbar": 0,
@@ -87,7 +73,7 @@
"idx": 1,
"in_create": 1,
"issingle": 1,
- "modified": "2015-05-07 05:43:49.760061",
+ "modified": "2015-06-30 03:00:26.420003",
"modified_by": "Administrator",
"module": "Setup",
"name": "Global Defaults",
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.py b/erpnext/setup/doctype/global_defaults/global_defaults.py
index a3fa3a9..efdc875 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.py
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.py
@@ -17,7 +17,6 @@
'hide_currency_symbol':'hide_currency_symbol',
'account_url':'account_url',
'disable_rounded_total': 'disable_rounded_total',
- 'jsonrates_api_key': 'jsonrates_api_key'
}
from frappe.model.document import Document
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 32d0bb6..1a8c5fa 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -190,7 +190,7 @@
"in_create": 1,
"issingle": 0,
"max_attachments": 3,
- "modified": "2015-02-16 23:50:48.113171",
+ "modified": "2015-07-13 05:28:26.719060",
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",
@@ -205,7 +205,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"submit": 0,
"write": 0
},
@@ -219,7 +219,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
},
@@ -231,7 +231,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 831095d..279ff0a 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-
+import urllib
from frappe.utils.nestedset import NestedSet
from frappe.website.website_generator import WebsiteGenerator
from frappe.website.render import clear_cache
@@ -91,7 +91,7 @@
# add missing absolute link in files
# user may forget it during upload
if (context.get("website_image") or "").startswith("files/"):
- context["website_image"] = "/" + context["website_image"]
+ context["website_image"] = "/" + urllib.quote(context["website_image"])
return frappe.get_template("templates/includes/product_in_grid.html").render(context)
def get_group_item_count(item_group):
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index bb589b2..81a4c4e 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -12,7 +12,6 @@
class NamingSeriesNotSetError(frappe.ValidationError): pass
class NamingSeries(Document):
-
def get_transactions(self, arg=None):
doctypes = list(set(frappe.db.sql_list("""select parent
from `tabDocField` where fieldname='naming_series'""")
@@ -21,12 +20,14 @@
prefixes = ""
for d in doctypes:
+ options = ""
try:
options = self.get_options(d)
except frappe.DoesNotExistError:
continue
- prefixes = prefixes + "\n" + options
+ if options:
+ prefixes = prefixes + "\n" + options
prefixes.replace("\n\n", "\n")
prefixes = "\n".join(sorted(prefixes.split()))
@@ -49,7 +50,7 @@
self.set_series_for(self.select_doc_for_series, series_list)
# create series
- map(self.insert_series, [d.split('.')[0] for d in series_list])
+ map(self.insert_series, [d.split('.')[0] for d in series_list if d.strip()])
msgprint(_("Series Updated"))
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index f81801d..a77fe67 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -176,20 +176,13 @@
"icon": "icon-envelope",
"idx": 1,
"issingle": 1,
- "modified": "2015-03-04 01:13:46.715113",
+ "modified": "2015-07-13 06:24:05.436127",
"modified_by": "Administrator",
"module": "Setup",
"name": "Notification Control",
"owner": "Administrator",
"permissions": [
{
- "create": 0,
- "permlevel": 0,
- "read": 1,
- "role": "Guest",
- "write": 0
- },
- {
"create": 1,
"permlevel": 0,
"read": 1,
diff --git a/erpnext/setup/doctype/sales_person/sales_person.py b/erpnext/setup/doctype/sales_person/sales_person.py
index 5f70b23..8542c88 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.py
+++ b/erpnext/setup/doctype/sales_person/sales_person.py
@@ -29,5 +29,7 @@
return frappe.db.get_value("User", user, "email") or user
def validate_employee_id(self):
- if frappe.db.exists({"doctype": "Sales Person","employee": self.employee}):
- frappe.throw("Another sales person with the same employee id exists.", frappe.DuplicateEntryError)
+ sales_person = frappe.db.get_value("Sales Person", {"employee": self.employee})
+
+ if sales_person and sales_person != self.name:
+ frappe.throw(_("Another Sales Person {0} exists with the same Employee id").format(sales_person))
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index cb1b6e1..c166590 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -32,7 +32,7 @@
],
"icon": "icon-legal",
"idx": 1,
- "modified": "2015-02-05 05:11:48.092112",
+ "modified": "2015-07-13 05:28:25.035649",
"modified_by": "Administrator",
"module": "Setup",
"name": "Terms and Conditions",
@@ -103,7 +103,7 @@
"apply_user_permissions": 1,
"permlevel": 0,
"read": 1,
- "role": "Material User"
+ "role": "Stock User"
}
]
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index ab1d7e7..256b328 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -136,7 +136,7 @@
"icon": "icon-map-marker",
"idx": 1,
"in_create": 0,
- "modified": "2015-02-05 05:11:48.158225",
+ "modified": "2015-07-13 05:28:25.602509",
"modified_by": "Administrator",
"module": "Setup",
"name": "Territory",
@@ -188,7 +188,7 @@
"apply_user_permissions": 1,
"permlevel": 0,
"read": 1,
- "role": "Material User"
+ "role": "Stock User"
},
{
"apply_user_permissions": 1,
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index c0bb4e1..9a1bef4 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -27,7 +27,7 @@
],
"icon": "icon-compass",
"idx": 1,
- "modified": "2015-02-05 05:11:48.493718",
+ "modified": "2015-07-13 05:28:23.143040",
"modified_by": "Administrator",
"module": "Setup",
"name": "UOM",
@@ -42,7 +42,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -56,7 +56,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"submit": 0,
"write": 0
},
@@ -70,7 +70,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
}
diff --git a/erpnext/setup/fixtures/web_form/addresses.json b/erpnext/setup/fixtures/web_form/addresses.json
new file mode 100644
index 0000000..8051c72
--- /dev/null
+++ b/erpnext/setup/fixtures/web_form/addresses.json
@@ -0,0 +1,167 @@
+[
+ {
+ "allow_comments": 0,
+ "allow_delete": 0,
+ "allow_edit": 1,
+ "allow_multiple": 1,
+ "breadcrumbs": null,
+ "doc_type": "Address",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "introduction_text": null,
+ "login_required": 1,
+ "modified": "2015-06-01 06:53:43.699336",
+ "name": "addresses",
+ "page_name": "addresses",
+ "published": 1,
+ "success_message": null,
+ "success_url": "/addresses",
+ "title": "Addresses",
+ "web_form_fields": [
+ {
+ "default": null,
+ "description": "",
+ "fieldname": "address_title",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Address Title",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "address_type",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "label": "Address Type",
+ "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "address_line1",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Address Line 1",
+ "options": null,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "address_line2",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Address Line 2",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "city",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "City/Town",
+ "options": null,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "state",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "State",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "pincode",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Pincode",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "country",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Country",
+ "options": "Country",
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": null,
+ "fieldtype": "Column Break",
+ "hidden": null,
+ "label": null,
+ "options": null,
+ "read_only": null,
+ "reqd": null
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "email_id",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Email Id",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "phone",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Phone",
+ "options": null,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": "0",
+ "description": "",
+ "fieldname": "is_primary_address",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "label": "Preferred Billing Address",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": "0",
+ "description": "",
+ "fieldname": "is_shipping_address",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "label": "Preferred Shipping Address",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ }
+ ],
+ "web_page_link_text": null
+ }
+]
\ No newline at end of file
diff --git a/erpnext/setup/fixtures/web_form/issues.json b/erpnext/setup/fixtures/web_form/issues.json
new file mode 100644
index 0000000..84ff1c2
--- /dev/null
+++ b/erpnext/setup/fixtures/web_form/issues.json
@@ -0,0 +1,68 @@
+[
+ {
+ "allow_comments": 1,
+ "allow_delete": 1,
+ "allow_edit": 1,
+ "allow_multiple": 1,
+ "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]",
+ "doc_type": "Issue",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "introduction_text": null,
+ "login_required": 1,
+ "modified": "2015-06-01 08:14:26.350792",
+ "name": "issues",
+ "page_name": "issues",
+ "published": 1,
+ "success_message": "",
+ "success_url": "/issues",
+ "title": "Issues",
+ "web_form_fields": [
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "subject",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Subject",
+ "options": null,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": "Open",
+ "description": null,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": null,
+ "label": "Status",
+ "options": "Open\nReplied\nHold\nClosed",
+ "read_only": 1,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "label": "Description",
+ "options": null,
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "default": null,
+ "description": null,
+ "fieldname": "attachment",
+ "fieldtype": "Attach",
+ "hidden": null,
+ "label": "Attachment",
+ "options": null,
+ "read_only": null,
+ "reqd": null
+ }
+ ],
+ "web_page_link_text": null
+ }
+]
\ No newline at end of file
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 3fbeabc..8ed6374 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -15,6 +15,7 @@
feature_setup()
from erpnext.setup.page.setup_wizard.setup_wizard import add_all_roles_to
add_all_roles_to("Administrator")
+ add_web_forms()
frappe.db.commit()
def feature_setup():
@@ -48,3 +49,12 @@
pass
frappe.db.set_default("date_format", "dd-mm-yyyy")
+
+def add_web_forms():
+ """Import web forms for Issues and Addresses"""
+ from frappe.modules.import_file import import_file_by_path
+
+ import_file_by_path(frappe.get_app_path("erpnext", "setup/fixtures/web_form/issues.json"),
+ data_import=True)
+ import_file_by_path(frappe.get_app_path("erpnext", "setup/fixtures/web_form/addresses.json"),
+ data_import=True)
diff --git a/erpnext/setup/page/setup_wizard/emails/email-1.md b/erpnext/setup/page/setup_wizard/emails/email-1.md
deleted file mode 100644
index 70c0c73..0000000
--- a/erpnext/setup/page/setup_wizard/emails/email-1.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Dear {{ fullname }},
-
-Thanks for setting up your ERPNext account!
-
-ERPNext is an open source and cloud ERP system that will help you to:
-
-1. Become organized by having a central repository of your data.
-1. Stay on top of what is happening in the organization.
-1. Prioritize and act quickly on pending activities.
-1. Analyze your performance and find improvement areas.
-1. Profit!
-
-Some tips on setting up ERPNext:
-
-1. Try and make dummy cycles: Run your dummy quotes, invoices, payments, deliveries in the system so that you can get familiar with what ERPNext can do for you.
-1. Data Import Tool: You can import bulk data into system using the data import tool: via **Setup > Data > Data Import Tool**.
-1. Add more users via **Setup > Users and Permissions > User**.
-1. If you are done with the testing and want to start fresh, you can delete your company and create a new one.
-
-If you need help or are stuck, [head to the user forum](https://discuss.frappe.io) or [read the manual](https://manual.erpnext.com).
-
-[Watch the ERPNext help tutorial videos](https://www.youtube.com/playlist?list=PL3lFfCEoMxvxDHtYyQFJeUYkWzQpXwFM9)
-
-
-Best of luck!
-
-Automatically Sent from your ERPNext Account
diff --git a/erpnext/setup/page/setup_wizard/emails/email-2.md b/erpnext/setup/page/setup_wizard/emails/email-2.md
deleted file mode 100644
index 3d7ad82..0000000
--- a/erpnext/setup/page/setup_wizard/emails/email-2.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Dear {{ fullname }},
-
-If you need help in setting up your ERPNext account, here are some resources:
-
-1. [Read the manual](https://manual.erpnext.com)
-1. [See the help videos](https://www.youtube.com/playlist?list=PL3lFfCEoMxvxDHtYyQFJeUYkWzQpXwFM9)
-1. [Ask your questions in the user forum](https://discuss.frappe.io)
-1. [Buy support from the ERPNext Team](https://erpnext.com/pricing)
-1. [Connect with a Service Provider](https://community.erpnext.com/service-providers)
-1. [Hangout on the community chat (gitter.im)](https://gitter.im/frappe/erpnext)
-
-Thanks!
-
-Automatically sent from your ERPNext Account
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index 6d4d826..d521ada 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -215,6 +215,7 @@
slide.get_field("language")
.set_input(erpnext.wiz.welcome.data.default_language || "english");
+ moment.locale("en");
}
});
},
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index b80d55e..4bb01d4 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -13,7 +13,6 @@
from frappe.utils.nestedset import get_root_of
from .default_website import website_maker
import install_fixtures
-from .welcome_emails import setup_welcome_emails
@frappe.whitelist()
def setup_account(args=None):
@@ -28,7 +27,7 @@
args = frappe._dict(args)
- if args.language != "english":
+ if args.language and args.language != "english":
set_default_language(args.language)
install_fixtures.install(args.get("country"))
@@ -78,8 +77,6 @@
login_as_first_user(args)
- setup_welcome_emails()
-
frappe.db.commit()
frappe.clear_cache()
@@ -197,6 +194,7 @@
"language": args.get("language"),
"time_zone": args.get("timezone"),
"float_precision": 3,
+ "email_footer_address": args.get("company"),
'date_format': frappe.db.get_value("Country", args.get("country"), "date_format"),
'number_format': number_format,
'enable_scheduler': 1 if not frappe.flags.in_test else 0
diff --git a/erpnext/setup/page/setup_wizard/welcome_emails.py b/erpnext/setup/page/setup_wizard/welcome_emails.py
deleted file mode 100644
index 03a9717..0000000
--- a/erpnext/setup/page/setup_wizard/welcome_emails.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import add_days, nowdate, get_fullname
-import markdown2
-
-def setup_welcome_emails():
- for email in (
- {"fname": "email-1.md", "subject": "Setting up ERPNext", "after": 1},
- {"fname": "email-2.md", "subject": "Getting ERPNext Help", "after": 3},
- ):
- content = frappe.get_template("setup/page/setup_wizard/emails/" \
- + email["fname"]).render({"fullname": get_fullname()})
-
- frappe.sendmail(recipients = frappe.session.user, subject = email["subject"],
- sender = "hello@erpnext.com",
- content=markdown2.markdown(content), as_bulk = True,
- send_after= add_days(nowdate(), email["after"]))
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index cef6079..f661edb 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -60,20 +60,21 @@
@frappe.whitelist()
def get_exchange_rate(from_currency, to_currency):
- jsonrates_api_key = frappe.conf.jsonrates_api_key or frappe.db.get_default("jsonrates_api_key")
-
- if jsonrates_api_key:
+ try:
cache = frappe.cache()
key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
value = cache.get(key)
if not value:
import requests
- response = requests.get("http://jsonrates.com/get/?from={0}&to={1}&apiKey={2}".format(from_currency,
- to_currency, jsonrates_api_key))
+ response = requests.get("http://api.fixer.io/latest", params={
+ "base": from_currency,
+ "symbols": to_currency
+ })
# expire in 24 hours
- value = response.json().get("rate")
+ response.raise_for_status()
+ value = response.json()["rates"][to_currency]
cache.setex(key, value, 24 * 60 * 60)
return flt(value)
- else:
+ except:
exchange = "%s-%s" % (from_currency, to_currency)
return flt(frappe.db.get_value("Currency Exchange", exchange, "exchange_rate"))
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 0b09eb7..cfba98b 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -5,17 +5,19 @@
import frappe
from frappe import throw, _
import frappe.defaults
-from frappe.utils import flt, get_fullname, fmt_money, cstr
+from frappe.utils import cint, flt, get_fullname, fmt_money, cstr
from erpnext.utilities.doctype.address.address import get_address_display
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings
from frappe.utils.nestedset import get_root_of
class WebsitePriceListMissingError(frappe.ValidationError): pass
def set_cart_count(quotation=None):
- if not quotation:
- quotation = _get_cart_quotation()
- cart_count = cstr(len(quotation.get("items")))
- frappe.local.cookie_manager.set_cookie("cart_count", cart_count)
+ if cint(frappe.db.get_singles_value("Shopping Cart Settings", "enabled")):
+ if not quotation:
+ quotation = _get_cart_quotation()
+ cart_count = cstr(len(quotation.get("items")))
+ frappe.local.cookie_manager.set_cookie("cart_count", cart_count)
@frappe.whitelist()
def get_cart_quotation(doc=None):
@@ -29,7 +31,7 @@
return {
"doc": decorate_quotation_doc(doc),
"addresses": [{"name": address.name, "display": address.display}
- for address in get_address_docs(party)],
+ for address in get_address_docs(party=party)],
"shipping_rules": get_applicable_shipping_rules(party)
}
@@ -161,7 +163,7 @@
else:
qdoc = frappe.get_doc({
"doctype": "Quotation",
- "naming_series": frappe.defaults.get_user_default("shopping_cart_quotation_series") or "QTN-CART-",
+ "naming_series": get_shopping_cart_settings().quotation_series or "QTN-CART-",
"quotation_to": party.doctype,
"company": frappe.db.get_value("Shopping Cart Settings", None, "company"),
"order_type": "Shopping Cart",
@@ -235,7 +237,9 @@
def set_price_list_and_rate(quotation, cart_settings, billing_territory):
"""set price list based on billing territory"""
- quotation.selling_price_list = cart_settings.get_price_list(billing_territory)
+
+ _set_price_list(quotation, cart_settings, billing_territory)
+
# reset values
quotation.price_list_currency = quotation.currency = \
quotation.plc_conversion_rate = quotation.conversion_rate = None
@@ -248,6 +252,18 @@
# set it in cookies for using in product page
frappe.local.cookie_manager.set_cookie("selling_price_list", quotation.selling_price_list)
+def _set_price_list(quotation, cart_settings, billing_territory):
+ # check if customer price list exists
+ selling_price_list = None
+ if quotation.customer:
+ selling_price_list = frappe.db.get_value("Customer", quotation.customer, "default_price_list")
+
+ # else check for territory based price list
+ if not selling_price_list:
+ selling_price_list = cart_settings.get_price_list(billing_territory)
+
+ quotation.selling_price_list = selling_price_list
+
def set_taxes(quotation, cart_settings, billing_territory):
"""set taxes based on billing territory"""
quotation.taxes_and_charges = cart_settings.get_tax_master(billing_territory)
@@ -281,12 +297,13 @@
return lead_doc
-def get_address_docs(party=None):
+def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None):
if not party:
party = get_lead_or_customer()
address_docs = frappe.db.sql("""select * from `tabAddress`
- where `%s`=%s order by name""" % (party.doctype.lower(), "%s"), party.name,
+ where `{0}`=%s order by name limit {1}, {2}""".format(party.doctype.lower(),
+ limit_start, limit_page_length), party.name,
as_dict=True, update={"doctype": "Address"})
for address in address_docs:
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
index 1ad344a..8fbf4a4 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
@@ -8,7 +8,7 @@
from frappe import _, msgprint
from frappe.utils import comma_and
from frappe.model.document import Document
-from frappe.utils.nestedset import get_ancestors_of
+from frappe.utils.nestedset import get_ancestors_of, get_root_of
from erpnext.utilities.doctype.address.address import get_territory_from_address
class ShoppingCartSetupError(frappe.ValidationError): pass
@@ -23,10 +23,6 @@
self.validate_tax_masters()
self.validate_exchange_rates_exist()
- def on_update(self):
- frappe.db.set_default("shopping_cart_enabled", self.get("enabled") or 0)
- frappe.db.set_default("shopping_cart_quotation_series", self.get("quotation_series"))
-
def validate_overlapping_territories(self, parentfield, fieldname):
# for displaying message
doctype = self.meta.get_field(parentfield).options
@@ -42,7 +38,7 @@
return territory_name_map
def validate_price_lists(self):
- territory_name_map = self.validate_overlapping_territories("price_lists", "selling_price_list")
+ self.validate_overlapping_territories("price_lists", "selling_price_list")
# validate that a Shopping Cart Price List exists for the default territory as a catch all!
price_list_for_default_territory = self.get_name_from_territory(self.default_territory, "price_lists",
@@ -130,6 +126,10 @@
def get_price_list(self, billing_territory):
price_list = self.get_name_from_territory(billing_territory, "price_lists", "selling_price_list")
+ if not (price_list and price_list[0]):
+ price_list = self.get_name_from_territory(self.default_territory or get_root_of("Territory"),
+ "price_lists", "selling_price_list")
+
return price_list and price_list[0] or None
def get_tax_master(self, billing_territory):
@@ -162,7 +162,7 @@
return get_shopping_cart_settings().enabled
def get_default_territory():
- return get_shopping_cart_settings().default_territory
+ return get_shopping_cart_settings().default_territory or get_root_of("Territory")
def check_shopping_cart_enabled():
if not get_shopping_cart_settings().enabled:
diff --git a/erpnext/shopping_cart/product.py b/erpnext/shopping_cart/product.py
index 85faa03..d7795d2 100644
--- a/erpnext/shopping_cart/product.py
+++ b/erpnext/shopping_cart/product.py
@@ -4,19 +4,19 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint, fmt_money, cstr
+from frappe.utils import cint, fmt_money
from erpnext.shopping_cart.cart import _get_cart_quotation
-from urllib import unquote
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
@frappe.whitelist(allow_guest=True)
def get_product_info(item_code):
"""get product price / stock info"""
- if not cint(frappe.db.get_default("shopping_cart_enabled")):
+ if not is_cart_enabled():
return {}
cart_quotation = _get_cart_quotation()
- price_list = cstr(unquote(frappe.local.request.cookies.get("selling_price_list")))
+ price_list = cart_quotation.selling_price_list
warehouse = frappe.db.get_value("Item", item_code, "website_warehouse")
if warehouse:
diff --git a/erpnext/shopping_cart/utils.py b/erpnext/shopping_cart/utils.py
index e63e452..7794a8f 100644
--- a/erpnext/shopping_cart/utils.py
+++ b/erpnext/shopping_cart/utils.py
@@ -6,11 +6,10 @@
import frappe
from frappe import _
import frappe.defaults
-from frappe.utils import cint
from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
def show_cart_count():
- if (frappe.db.get_default("shopping_cart_enabled") and
+ if (is_cart_enabled() and
frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User"):
return True
@@ -44,6 +43,6 @@
{"label": _("Orders"), "url": "orders"},
{"label": _("Invoices"), "url": "invoices"},
{"label": _("Shipments"), "url": "shipments"},
- # {"label": _("Issues"), "url": "tickets"},
+ {"label": _("Issues"), "url": "issues"},
{"label": _("Addresses"), "url": "addresses"},
])
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index e847cfa..4190f2d 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -14,7 +14,7 @@
"Contact": {"status": "Open"},
"Opportunity": {"status": "Open"},
"Quotation": {"docstatus": 0},
- "Sales Order": { "per_delivered": ("<", 100), "status": ("!=", "Stopped"), "docstatus": ("<", 2) },
+ "Sales Order": { "per_billed": ("<", 100), "status": ("!=", "Stopped"), "docstatus": ("<", 2) },
"Journal Entry": {"docstatus": 0},
"Sales Invoice": { "outstanding_amount": (">", 0), "docstatus": ("<", 2) },
"Purchase Invoice": {"docstatus": 0},
@@ -25,7 +25,7 @@
"Delivery Note": {"docstatus": 0},
"Stock Entry": {"docstatus": 0},
"Material Request": {"docstatus": 0},
- "Purchase Order": { "per_received": ("<", 100), "status": ("!=", "Stopped"), "docstatus": ("<", 2) },
+ "Purchase Order": { "per_billed": ("<", 100), "status": ("!=", "Stopped"), "docstatus": ("<", 2) },
"Production Order": { "status": "In Process" },
"BOM": {"docstatus": 0},
"Timesheet": {"docstatus": 0},
diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py
index feb55c7..824786b 100644
--- a/erpnext/stock/__init__.py
+++ b/erpnext/stock/__init__.py
@@ -1,8 +1,8 @@
from __future__ import unicode_literals
install_docs = [
- {"doctype":"Role", "role_name":"Material Manager", "name":"Material Manager"},
- {"doctype":"Role", "role_name":"Material Master Manager", "name":"Material Master Manager"},
- {"doctype":"Role", "role_name":"Material User", "name":"Material User"},
+ {"doctype":"Role", "role_name":"Stock Manager", "name":"Stock Manager"},
+ {"doctype":"Role", "role_name":"Item Manager", "name":"Item Manager"},
+ {"doctype":"Role", "role_name":"Stock User", "name":"Stock User"},
{"doctype":"Role", "role_name":"Quality Manager", "name":"Quality Manager"},
{"doctype":"Item Group", "item_group_name":"All Item Groups", "is_group":"Yes"},
{"doctype":"Item Group", "item_group_name":"Default",
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 756955b..3430ee1 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -62,7 +62,7 @@
"icon": "icon-archive",
"idx": 1,
"max_attachments": 5,
- "modified": "2015-02-05 05:11:34.824412",
+ "modified": "2015-07-13 05:28:24.973774",
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",
@@ -77,7 +77,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 2160ca4..11a86ef 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -162,7 +162,7 @@
"hide_toolbar": 1,
"idx": 1,
"in_create": 1,
- "modified": "2014-05-27 03:49:07.654364",
+ "modified": "2015-07-13 05:28:24.087304",
"modified_by": "Administrator",
"module": "Stock",
"name": "Bin",
@@ -197,7 +197,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
}
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 541ebd6..72a7227 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1,1163 +1,1163 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-24 19:29:09",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-24 19:29:09",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "delivery_to_section",
- "fieldtype": "Section Break",
- "label": "Delivery To",
- "options": "icon-user",
+ "fieldname": "delivery_to_section",
+ "fieldtype": "Section Break",
+ "label": "Delivery To",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_width": "50%",
- "read_only": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_width": "50%",
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "DN-",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "DN-",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "customer",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer",
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer",
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "depends_on": "customer",
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_list_view": 0,
- "label": "Customer Name",
- "permlevel": 0,
+ "depends_on": "customer",
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Customer Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "depends_on": "customer",
- "fieldname": "customer_address",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Billing Address Name",
- "options": "Address",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "customer",
+ "fieldname": "customer_address",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Billing Address Name",
+ "options": "Address",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Billing Address",
- "permlevel": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Billing Address",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "shipping_address_name",
- "fieldtype": "Link",
- "label": "Shipping Address",
- "options": "Address",
- "permlevel": 0,
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "label": "Shipping Address",
+ "options": "Address",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "shipping_address",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Shipping Address",
- "permlevel": 0,
+ "fieldname": "shipping_address",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Shipping Address",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "options": "Delivery Note",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
+ "allow_on_submit": 0,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "options": "Delivery Note",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "description": "",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 0,
- "reqd": 1,
- "search_index": 1,
+ "description": "",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "no_copy": 1,
- "oldfieldname": "posting_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "100px",
- "read_only": 0,
- "reqd": 1,
- "search_index": 1,
+ "default": "Today",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "no_copy": 1,
+ "oldfieldname": "posting_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "100px",
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "po_no",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Customer's Purchase Order No",
- "no_copy": 0,
- "oldfieldname": "po_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
+ "fieldname": "po_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Customer's Purchase Order No",
+ "no_copy": 0,
+ "oldfieldname": "po_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
"width": "100px"
- },
+ },
{
- "depends_on": "eval:doc.po_no",
- "fieldname": "po_date",
- "fieldtype": "Date",
- "hidden": 0,
- "label": "Customer's Purchase Order Date",
- "no_copy": 0,
- "oldfieldname": "po_date",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
+ "depends_on": "eval:doc.po_no",
+ "fieldname": "po_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "label": "Customer's Purchase Order Date",
+ "no_copy": 0,
+ "oldfieldname": "po_date",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "cusrrency_and_price_list",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
- "permlevel": 0,
+ "fieldname": "cusrrency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "description": "Rate at which customer's currency is converted to company's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Exchange Rate",
- "no_copy": 0,
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "read_only": 0,
+ "description": "Rate at which customer's currency is converted to company's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "no_copy": 0,
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "col_break23",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "col_break23",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "selling_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "Price List",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "selling_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "Price List",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "description": "Rate at which Price list currency is converted to company's base currency",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "read_only": 0,
+ "description": "Rate at which Price list currency is converted to company's base currency",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
"print_hide": 1
- },
+ },
{
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "permlevel": 0,
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "no_copy": 0,
- "oldfieldname": "delivery_note_details",
- "oldfieldtype": "Table",
- "options": "Delivery Note Item",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "no_copy": 0,
+ "oldfieldname": "delivery_note_details",
+ "oldfieldtype": "Table",
+ "options": "Delivery Note Item",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "packing_list",
- "fieldtype": "Section Break",
- "label": "Packing List",
- "oldfieldtype": "Section Break",
- "options": "icon-suitcase",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "packing_list",
+ "fieldtype": "Section Break",
+ "label": "Packing List",
+ "oldfieldtype": "Section Break",
+ "options": "icon-suitcase",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "packed_items",
- "fieldtype": "Table",
- "label": "Packed Items",
- "oldfieldname": "packing_details",
- "oldfieldtype": "Table",
- "options": "Packed Item",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "packed_items",
+ "fieldtype": "Table",
+ "label": "Packed Items",
+ "oldfieldname": "packing_details",
+ "oldfieldtype": "Table",
+ "options": "Packed Item",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "sales_bom_help",
- "fieldtype": "HTML",
- "label": "Sales BOM Help",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "product_bundle_help",
+ "fieldtype": "HTML",
+ "label": "Product Bundle Help",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_31",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_31",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "column_break_33",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_33",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "Taxes and Charges",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "Taxes and Charges",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "description": "If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "oldfieldname": "charge",
- "oldfieldtype": "Link",
- "options": "Sales Taxes and Charges Template",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "oldfieldname": "charge",
+ "oldfieldtype": "Link",
+ "options": "Sales Taxes and Charges Template",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break_39",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_39",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "shipping_rule",
- "fieldtype": "Link",
- "label": "Shipping Rule",
- "oldfieldtype": "Button",
- "options": "Shipping Rule",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "shipping_rule",
+ "fieldtype": "Link",
+ "label": "Shipping Rule",
+ "oldfieldtype": "Button",
+ "options": "Shipping Rule",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_41",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_41",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Sales Taxes and Charges",
- "no_copy": 0,
- "oldfieldname": "other_charges",
- "oldfieldtype": "Table",
- "options": "Sales Taxes and Charges",
- "permlevel": 0,
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Sales Taxes and Charges",
+ "no_copy": 0,
+ "oldfieldname": "other_charges",
+ "oldfieldtype": "Table",
+ "options": "Sales Taxes and Charges",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_44",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_44",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "column_break_47",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_47",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "section_break_49",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_49",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Discount On",
- "options": "\nGrand Total\nNet Total",
- "permlevel": 0,
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "column_break_51",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_51",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency",
- "permlevel": 0,
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "description": "In Words will be visible once you save the Delivery Note.",
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "no_copy": 0,
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "200px",
- "read_only": 1,
+ "description": "In Words will be visible once you save the Delivery Note.",
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "no_copy": 0,
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "200px",
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "no_copy": 0,
- "oldfieldname": "grand_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "no_copy": 0,
+ "oldfieldname": "grand_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "no_copy": 0,
- "oldfieldname": "rounded_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "150px",
- "read_only": 1,
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "no_copy": 0,
+ "oldfieldname": "rounded_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "description": "In Words (Export) will be visible once you save the Delivery Note.",
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "no_copy": 0,
- "oldfieldname": "in_words_export",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_width": "150px",
- "read_only": 1,
+ "description": "In Words (Export) will be visible once you save the Delivery Note.",
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "no_copy": 0,
+ "oldfieldname": "in_words_export",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "fold",
- "fieldtype": "Fold",
+ "fieldname": "fold",
+ "fieldtype": "Fold",
"permlevel": 0
- },
+ },
{
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "oldfieldtype": "Section Break",
- "options": "icon-legal",
- "permlevel": 0,
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "oldfieldtype": "Section Break",
+ "options": "icon-legal",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions Details",
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions Details",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "transporter_info",
- "fieldtype": "Section Break",
- "label": "Transporter Info",
- "options": "icon-truck",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "transporter_info",
+ "fieldtype": "Section Break",
+ "label": "Transporter Info",
+ "options": "icon-truck",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "transporter_name",
- "fieldtype": "Data",
- "label": "Transporter Name",
- "no_copy": 0,
- "oldfieldname": "transporter_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 0,
- "reqd": 0,
+ "fieldname": "transporter_name",
+ "fieldtype": "Data",
+ "label": "Transporter Name",
+ "no_copy": 0,
+ "oldfieldname": "transporter_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 0,
+ "reqd": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "col_break34",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_width": "50%",
- "read_only": 0,
+ "fieldname": "col_break34",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_width": "50%",
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "description": "Transporter lorry number",
- "fieldname": "lr_no",
- "fieldtype": "Data",
- "label": "Vehicle No",
- "no_copy": 0,
- "oldfieldname": "lr_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 0,
- "reqd": 0,
+ "description": "Transporter lorry number",
+ "fieldname": "lr_no",
+ "fieldtype": "Data",
+ "label": "Vehicle No",
+ "no_copy": 0,
+ "oldfieldname": "lr_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 0,
+ "reqd": 0,
"width": "100px"
- },
+ },
{
- "default": "Today",
- "description": "Date on which lorry started from your warehouse",
- "fieldname": "lr_date",
- "fieldtype": "Date",
- "label": "Vehicle Dispatch Date",
- "no_copy": 0,
- "oldfieldname": "lr_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 0,
+ "default": "Today",
+ "description": "Date on which lorry started from your warehouse",
+ "fieldname": "lr_date",
+ "fieldtype": "Date",
+ "label": "Vehicle Dispatch Date",
+ "no_copy": 0,
+ "oldfieldname": "lr_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 0,
"width": "100px"
- },
+ },
{
- "depends_on": "customer",
- "fieldname": "contact_info",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "options": "icon-bullhorn",
- "permlevel": 0,
+ "depends_on": "customer",
+ "fieldname": "contact_info",
+ "fieldtype": "Section Break",
+ "label": "Contact Info",
+ "options": "icon-bullhorn",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "description": "",
- "fieldname": "territory",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "description": "",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "description": "",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "options": "Customer Group",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "description": "",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "options": "Customer Group",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "col_break21",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_width": "50%",
- "read_only": 0,
+ "fieldname": "col_break21",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_width": "50%",
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Contact Person",
- "options": "Contact",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Contact Person",
+ "options": "Contact",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "description": "Track this Delivery Note against any Project",
- "fieldname": "project_name",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Project Name",
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "permlevel": 0,
- "read_only": 0,
+ "description": "Track this Delivery Note against any Project",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
+ "permlevel": 0,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "depends_on": "eval:doc.source == 'Campaign'",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "label": "Campaign",
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "label": "Campaign",
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "source",
- "fieldtype": "Select",
- "label": "Source",
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "label": "Source",
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "50%",
- "read_only": 0,
+ "fieldname": "column_break5",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "50%",
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "description": "Time at which items were delivered from warehouse",
- "fieldname": "posting_time",
- "fieldtype": "Time",
- "in_filter": 0,
- "label": "Posting Time",
- "oldfieldname": "posting_time",
- "oldfieldtype": "Time",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 0,
- "reqd": 1,
- "search_index": 0,
+ "description": "Time at which items were delivered from warehouse",
+ "fieldname": "posting_time",
+ "fieldtype": "Time",
+ "in_filter": 0,
+ "label": "Posting Time",
+ "oldfieldname": "posting_time",
+ "oldfieldtype": "Time",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0,
"width": "100px"
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 0,
- "reqd": 1,
- "search_index": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Link",
- "options": "Letter Head",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Link",
+ "options": "Letter Head",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "print_without_amount",
- "fieldtype": "Check",
- "label": "Print Without Amount",
- "oldfieldname": "print_without_amount",
- "oldfieldtype": "Check",
- "permlevel": 0,
- "print_hide": 1,
+ "allow_on_submit": 1,
+ "fieldname": "print_without_amount",
+ "fieldtype": "Check",
+ "label": "Print Without Amount",
+ "oldfieldname": "print_without_amount",
+ "oldfieldtype": "Check",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_83",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_83",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "default": "Draft",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nCancelled",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 1,
- "search_index": 1,
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nCancelled",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "depends_on": "eval:!doc.__islocal",
- "description": "% of materials delivered against this Delivery Note",
- "fieldname": "per_installed",
- "fieldtype": "Percent",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "% Installed",
- "no_copy": 1,
- "oldfieldname": "per_installed",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "description": "% of materials delivered against this Delivery Note",
+ "fieldname": "per_installed",
+ "fieldtype": "Percent",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "% Installed",
+ "no_copy": 1,
+ "oldfieldname": "per_installed",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "installation_status",
- "fieldtype": "Select",
- "hidden": 1,
- "label": "Installation Status",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "installation_status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "label": "Installation Status",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break_89",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_89",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "description": "Required only for sample item.",
- "fieldname": "to_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "To Warehouse",
- "no_copy": 1,
- "oldfieldname": "to_warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "Required only for sample item.",
+ "fieldname": "to_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "To Warehouse",
+ "no_copy": 1,
+ "oldfieldname": "to_warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "excise_page",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Excise Page Number",
- "oldfieldname": "excise_page",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "excise_page",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Excise Page Number",
+ "oldfieldname": "excise_page",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "instructions",
- "fieldtype": "Text",
- "label": "Instructions",
- "oldfieldname": "instructions",
- "oldfieldtype": "Text",
- "permlevel": 0,
+ "fieldname": "instructions",
+ "fieldtype": "Text",
+ "label": "Instructions",
+ "oldfieldname": "instructions",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "sales_team_section_break",
- "fieldtype": "Section Break",
- "label": "Sales Team",
- "oldfieldtype": "Section Break",
- "options": "icon-group",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "sales_team_section_break",
+ "fieldtype": "Section Break",
+ "label": "Sales Team",
+ "oldfieldtype": "Section Break",
+ "options": "icon-group",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "sales_partner",
- "fieldtype": "Link",
- "label": "Sales Partner",
- "no_copy": 0,
- "oldfieldname": "sales_partner",
- "oldfieldtype": "Link",
- "options": "Sales Partner",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 0,
+ "fieldname": "sales_partner",
+ "fieldtype": "Link",
+ "label": "Sales Partner",
+ "no_copy": 0,
+ "oldfieldname": "sales_partner",
+ "oldfieldtype": "Link",
+ "options": "Sales Partner",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 0,
"width": "150px"
- },
+ },
{
- "fieldname": "column_break7",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "50%",
- "read_only": 0,
+ "fieldname": "column_break7",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "50%",
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "commission_rate",
- "fieldtype": "Float",
- "label": "Commission Rate (%)",
- "no_copy": 0,
- "oldfieldname": "commission_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 0,
+ "fieldname": "commission_rate",
+ "fieldtype": "Float",
+ "label": "Commission Rate (%)",
+ "no_copy": 0,
+ "oldfieldname": "commission_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 0,
"width": "100px"
- },
+ },
{
- "fieldname": "total_commission",
- "fieldtype": "Currency",
- "label": "Total Commission",
- "no_copy": 0,
- "oldfieldname": "total_commission",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_commission",
+ "fieldtype": "Currency",
+ "label": "Total Commission",
+ "no_copy": 0,
+ "oldfieldname": "total_commission",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break1",
- "fieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "sales_team",
- "fieldtype": "Table",
- "label": "Sales Team1",
- "oldfieldname": "sales_team",
- "oldfieldtype": "Table",
- "options": "Sales Team",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "sales_team",
+ "fieldtype": "Table",
+ "label": "Sales Team1",
+ "oldfieldname": "sales_team",
+ "oldfieldtype": "Table",
+ "options": "Sales Team",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
}
- ],
- "hide_toolbar": 0,
- "icon": "icon-truck",
- "idx": 1,
- "in_create": 0,
- "is_submittable": 1,
- "modified": "2015-04-24 00:12:12.119033",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Delivery Note",
- "owner": "Administrator",
+ ],
+ "hide_toolbar": 0,
+ "icon": "icon-truck",
+ "idx": 1,
+ "in_create": 0,
+ "is_submittable": 1,
+ "modified": "2015-07-13 05:28:29.814096",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Delivery Note",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "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,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material Manager",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 1,
- "role": "Accounts User",
- "submit": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "apply_user_permissions": 1,
- "cancel": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Customer"
- },
+ },
{
- "permlevel": 1,
- "read": 1,
- "role": "Material Manager",
+ "permlevel": 1,
+ "read": 1,
+ "role": "Stock Manager",
"write": 1
}
- ],
- "read_only_onload": 1,
- "search_fields": "status,customer,customer_name, territory,base_grand_total",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only_onload": 1,
+ "search_fields": "status,customer,customer_name, territory,base_grand_total",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 831e537..90a8a6c 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -108,10 +108,9 @@
if not self.installation_status: self.installation_status = 'Not Installed'
def validate_with_previous_doc(self):
- items = self.get("items")
-
- for fn in (("Sales Order", "against_sales_order"), ("Sales Invoice", "against_sales_invoice")):
- if filter(None, [getattr(d, fn[1], None) for d in items]):
+ for fn in (("Sales Order", "against_sales_order", "so_detail"),
+ ("Sales Invoice", "against_sales_invoice", "si_detail")):
+ if filter(None, [getattr(d, fn[1], None) for d in self.get("items")]):
super(DeliveryNote, self).validate_with_previous_doc({
fn[0]: {
"ref_dn_field": fn[1],
@@ -119,15 +118,10 @@
["currency", "="]],
},
})
-
- if cint(frappe.defaults.get_global_default('maintain_same_sales_rate')):
- super(DeliveryNote, self).validate_with_previous_doc({
- fn[0] + " Item": {
- "ref_dn_field": "so_detail",
- "compare_fields": [["rate", "="]],
- "is_child_table": True
- }
- })
+
+ if cint(frappe.db.get_single_value('Selling Settings', 'maintain_same_sales_rate')):
+ self.validate_rate_with_reference_doc([["Sales Order", "sales_order", "so_detail"],
+ ["Sales Invoice", "sales_invoice", "si_detail"]])
def validate_proj_cust(self):
"""check for does customer belong to same project as entered.."""
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 59b4531..978e968 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -7,7 +7,7 @@
import frappe
import json
import frappe.defaults
-from frappe.utils import cint, nowdate, nowtime, cstr, add_days
+from frappe.utils import cint, nowdate, nowtime, cstr, add_days, flt
from erpnext.stock.stock_ledger import get_previous_sle
from erpnext.accounts.utils import get_balance_on
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
@@ -112,7 +112,7 @@
stock_in_hand_account = frappe.db.get_value("Account", {"warehouse": "_Test Warehouse - _TC"})
prev_bal = get_balance_on(stock_in_hand_account)
- dn = create_delivery_note(item_code="_Test Sales BOM Item")
+ dn = create_delivery_note(item_code="_Test Product Bundle Item")
stock_value_diff_rm1 = abs(frappe.db.get_value("Stock Ledger Entry",
{"voucher_type": "Delivery Note", "voucher_no": dn.name, "item_code": "_Test Item"},
@@ -136,7 +136,7 @@
# check stock in hand balance
bal = get_balance_on(stock_in_hand_account)
- self.assertEquals(bal, prev_bal - stock_value_diff)
+ self.assertEquals(flt(bal, 2), flt(prev_bal - stock_value_diff, 2))
dn.cancel()
self.assertFalse(get_gl_entries("Delivery Note", dn.name))
@@ -208,4 +208,4 @@
dn.submit()
return dn
-test_dependencies = ["Sales BOM"]
+test_dependencies = ["Product Bundle"]
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 d09e7ad..4bb326b 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -65,7 +65,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -134,10 +134,11 @@
"width": "100px"
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 1,
- "label": "Discount (%)",
+ "label": "Discount on Price List Rate (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
"permlevel": 0,
@@ -522,7 +523,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:52:20.610748",
+ "modified": "2015-06-02 14:18:34.512236",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index b31b682..58b1adb 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -5,39 +5,6 @@
frappe.ui.form.on("Item", {
onload: function(frm) {
- var df = frappe.meta.get_docfield("Item Variant", "item_attribute_value");
- df.on_make = function(field) {
- field.$input.autocomplete({
- minLength: 0,
- minChars: 0,
- source: function(request, response) {
- frappe.call({
- method:"frappe.client.get_list",
- args:{
- doctype:"Item Attribute Value",
- filters: [
- ["parent","=", field.doc.item_attribute],
- ["attribute_value", "like", request.term + "%"]
- ],
- fields: ["attribute_value"]
- },
- callback: function(r) {
- response($.map(r.message, function(d) { return d.attribute_value; }));
- }
- });
- },
- select: function(event, ui) {
- field.$input.val(ui.item.value);
- field.$input.trigger("change");
- },
- focus: function( event, ui ) {
- if(ui.item.action) {
- return false;
- }
- },
- });
- }
-
erpnext.item.setup_queries(frm);
},
@@ -55,6 +22,9 @@
// read only if any stock ledger entry exists
erpnext.item.make_dashboard(frm);
+ // clear intro
+ frm.set_intro();
+
if (frm.doc.has_variants) {
frm.set_intro(__("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"), true);
frm.add_custom_button(__("Show Variants"), function() {
@@ -85,7 +55,7 @@
erpnext.item.weight_to_validate(frm);
erpnext.item.variants_can_not_be_created_manually(frm);
},
-
+
image: function(frm) {
refresh_field("image_view");
},
@@ -110,8 +80,14 @@
method: "copy_specification_from_item_group"
});
},
+
is_stock_item: function(frm) {
erpnext.item.toggle_reqd(frm);
+ },
+
+ manage_variants: function(frm) {
+ frappe.route_options = {"item_code": frm.doc.name };
+ frappe.set_route("List", "Manage Variants");
}
});
@@ -209,11 +185,11 @@
validated = 0;
}
},
-
+
variants_can_not_be_created_manually: function(frm) {
if (frm.doc.__islocal && frm.doc.variant_of)
frappe.throw(__("Variants can not be created manually, add item attributes in the template item"))
}
-
+
});
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 282d182..1012cda 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -12,7 +12,7 @@
{
"fieldname": "name_and_description_section",
"fieldtype": "Section Break",
- "label": "Name and Description",
+ "label": "",
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "icon-flag",
@@ -167,35 +167,59 @@
"search_index": 0
},
{
- "depends_on": "eval:!!!doc.variant_of",
+ "depends_on": "eval:!doc.variant_of",
"fieldname": "variants_section",
"fieldtype": "Section Break",
- "label": "Variants",
+ "label": "Variant",
"permlevel": 0,
"precision": ""
},
{
"default": "0",
- "description": "Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",
+ "depends_on": "",
+ "description": "If this item has variants, then it cannot be selected in sales orders etc.",
"fieldname": "has_variants",
"fieldtype": "Check",
"label": "Has Variants",
+ "no_copy": 1,
"options": "",
"permlevel": 0,
"precision": "",
"read_only": 0
},
{
- "depends_on": "has_variants",
- "description": "A new variant (Item) will be created for each attribute value combination",
- "fieldname": "variants",
- "fieldtype": "Table",
- "label": "Variants",
- "options": "Item Variant",
+ "fieldname": "column_break_18",
+ "fieldtype": "Column Break",
"permlevel": 0,
"precision": ""
},
{
+ "depends_on": "has_variants",
+ "fieldname": "manage_variants",
+ "fieldtype": "Button",
+ "label": "Manage Variants",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "section_break_20",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "variant_of",
+ "fieldname": "attributes",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "label": "Attributes",
+ "no_copy": 1,
+ "options": "Variant Attribute",
+ "permlevel": 0,
+ "precision": "",
+ "read_only": 1
+ },
+ {
"fieldname": "inventory",
"fieldtype": "Section Break",
"label": "Inventory",
@@ -575,6 +599,7 @@
"description": "Publish Item to hub.erpnext.com",
"fieldname": "publish_in_hub",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Publish in Hub",
"permlevel": 0,
"precision": ""
@@ -706,7 +731,7 @@
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Default BOM",
- "no_copy": 0,
+ "no_copy": 1,
"oldfieldname": "default_bom",
"oldfieldtype": "Link",
"options": "BOM",
@@ -878,7 +903,7 @@
"icon": "icon-tag",
"idx": 1,
"max_attachments": 1,
- "modified": "2015-05-04 18:44:46.090445",
+ "modified": "2015-07-13 05:28:28.698107",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
@@ -893,7 +918,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -907,7 +932,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"submit": 0,
"write": 0
},
@@ -921,7 +946,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
},
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index de60502..a2e0ade 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -9,10 +9,9 @@
from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for, get_parent_item_groups
from frappe.website.render import clear_cache
from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
-import copy
+from erpnext.stock.doctype.manage_variants.manage_variants import update_variant
class WarehouseNotSet(frappe.ValidationError): pass
-class DuplicateVariant(frappe.ValidationError): pass
class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
class Item(WebsiteGenerator):
@@ -48,9 +47,6 @@
if self.image and not self.website_image:
self.website_image = self.image
- if self.variant_of:
- self.copy_attributes_to_variant(frappe.get_doc("Item", self.variant_of), self)
-
self.check_warehouse_is_set_for_stock_item()
self.check_stock_uom_with_bin()
self.add_default_uom_in_conversion_factor_table()
@@ -63,9 +59,10 @@
self.cant_change()
self.validate_reorder_level()
self.validate_warehouse_for_reorder()
- self.validate_variants()
self.update_item_desc()
self.synced_with_hub = 0
+ self.validate_has_variants()
+ self.validate_stock_for_template_must_be_zero()
if not self.get("__islocal"):
self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
@@ -77,7 +74,7 @@
invalidate_cache_for_item(self)
self.validate_name_with_item_group()
self.update_item_price()
- self.sync_variants()
+ self.update_variants()
def get_context(self, context):
context["parent_groups"] = get_parent_item_groups(self.item_group) + \
@@ -133,136 +130,6 @@
if not matched:
frappe.throw(_("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."))
- def validate_variants(self):
- self.validate_variants_are_unique()
- self.validate_stock_for_template_must_be_zero()
-
- def validate_stock_for_template_must_be_zero(self):
- if self.has_variants:
- stock_in = frappe.db.sql_list("""select warehouse from tabBin
- where item_code=%s and ifnull(actual_qty, 0) > 0""", self.name)
- if stock_in:
- frappe.throw(_("Item Template cannot have stock and varaiants. Please remove stock from warehouses {0}").format(", ".join(stock_in)),
- ItemTemplateCannotHaveStock)
-
- def validate_variants_are_unique(self):
- if not self.has_variants:
- self.variants = []
- return
-
- if self.variants:
- if self.variant_of:
- frappe.throw(_("Item cannot be a variant of a variant"))
-
- variants = []
- for d in self.variants:
- key = (d.item_attribute, d.item_attribute_value)
- if key in variants:
- frappe.throw(_("{0} {1} is entered more than once in Item Variants table")
- .format(d.item_attribute, d.item_attribute_value), DuplicateVariant)
- variants.append(key)
- else:
- frappe.throw(_("Please enter atleast one attribute row in Item Variants table"))
-
- def sync_variants(self):
- variant_item_codes = self.get_variant_item_codes()
-
- # delete missing variants
- existing_variants = [d.name for d in frappe.get_all("Item",
- filters={"variant_of":self.name})]
-
- updated, deleted = [], []
- for existing_variant in existing_variants:
- if existing_variant not in variant_item_codes:
- frappe.delete_doc("Item", existing_variant)
- deleted.append(existing_variant)
- else:
- self.update_variant(existing_variant)
- updated.append(existing_variant)
-
- inserted = []
- for item_code in variant_item_codes:
- if item_code not in existing_variants:
- self.make_variant(item_code)
- inserted.append(item_code)
-
- if inserted:
- frappe.msgprint(_("Item Variants {0} created").format(", ".join(inserted)))
-
- if updated:
- frappe.msgprint(_("Item Variants {0} updated").format(", ".join(updated)))
-
- if deleted:
- frappe.msgprint(_("Item Variants {0} deleted").format(", ".join(deleted)))
-
- def get_variant_item_codes(self):
- """Get all possible suffixes for variants"""
- if not self.variants:
- return []
-
- self.variant_attributes = {}
- variant_dict = {}
- variant_item_codes = []
-
- for d in self.variants:
- variant_dict.setdefault(d.item_attribute, []).append(d.item_attribute_value)
-
- all_attributes = [d.name for d in frappe.get_all("Item Attribute", order_by = "priority asc")]
-
- # sort attributes by their priority
- attributes = filter(None, map(lambda d: d if d in variant_dict else None, all_attributes))
-
- def add_attribute_suffixes(item_code, my_attributes, attributes):
- attr = frappe.get_doc("Item Attribute", attributes[0])
- for value in attr.item_attribute_values:
- if value.attribute_value in variant_dict[attr.name]:
- _my_attributes = copy.deepcopy(my_attributes)
- _my_attributes.append([attr.name, value.attribute_value])
- if len(attributes) > 1:
- add_attribute_suffixes(item_code + "-" + value.abbr, _my_attributes, attributes[1:])
- else:
- variant_item_codes.append(item_code + "-" + value.abbr)
- self.variant_attributes[item_code + "-" + value.abbr] = _my_attributes
-
- add_attribute_suffixes(self.name, [], attributes)
-
- return variant_item_codes
-
- def make_variant(self, item_code):
- item = frappe.new_doc("Item")
- item.item_code = item_code
- self.copy_attributes_to_variant(self, item, insert=True)
- item.insert()
-
- def update_variant(self, item_code):
- item = frappe.get_doc("Item", item_code)
- item.item_code = item_code
- self.copy_attributes_to_variant(self, item)
- item.save()
-
- def copy_attributes_to_variant(self, template, variant, insert=False):
- from frappe.model import no_value_fields
- for field in self.meta.fields:
- if field.fieldtype not in no_value_fields and (insert or not field.no_copy)\
- and field.fieldname not in ("item_code", "item_name"):
- if variant.get(field.fieldname) != template.get(field.fieldname):
- variant.set(field.fieldname, template.get(field.fieldname))
- variant.__dirty = True
-
- variant.description += "\n"
-
- if not getattr(template, "variant_attributes", None):
- template.get_variant_item_codes()
-
- for attr in template.variant_attributes[variant.item_code]:
- variant.description += "<p>" + attr[0] + ": " + attr[1] + "</p>"
-
- variant.item_name = self.item_name + variant.item_code[len(self.name):]
-
- variant.variant_of = template.name
- variant.has_variants = 0
- variant.show_in_website = 0
-
def update_template_tables(self):
template = frappe.get_doc("Item", self.variant_of)
@@ -307,15 +174,6 @@
if bom_item not in (self.name, self.variant_of):
frappe.throw(_("Default BOM ({0}) must be active for this item or its template").format(bom_item))
- if self.is_purchase_item != "Yes":
- bom_mat = frappe.db.sql("""select distinct t1.parent
- from `tabBOM Item` t1, `tabBOM` t2 where t2.name = t1.parent
- and t1.item_code =%s and ifnull(t1.bom_no, '') = '' and t2.is_active = 1
- and t2.docstatus = 1 and t1.docstatus =1 """, self.name)
-
- if bom_mat and bom_mat[0][0]:
- frappe.throw(_("Item must be a purchase item, as it is present in one or many Active BOMs"))
-
def fill_customer_code(self):
""" Append all the customer codes and insert into "customer_code" field of item table """
cust_code=[]
@@ -355,7 +213,8 @@
vals.has_batch_no != self.has_batch_no or
cstr(vals.valuation_method) != cstr(self.valuation_method)):
if self.check_if_sle_exists() == "exists":
- frappe.throw(_("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'"))
+ frappe.throw(_("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'"))
def validate_reorder_level(self):
if cint(self.apply_warehouse_wise_reorder_level):
@@ -454,9 +313,33 @@
def update_item_desc(self):
if frappe.db.get_value('BOM',self.name, 'description') != self.description:
frappe.db.sql("""update `tabBOM` set description = %s where item = %s and docstatus < 2""",(self.description, self.name))
- frappe.db.sql("""update `tabBOM Item` set description = %s where item_code = %s and docstatus < 2""",(self.description, self.name))
- frappe.db.sql("""update `tabBOM Explosion Item` set description = %s where item_code = %s and docstatus < 2""",(self.description, self.name))
+ frappe.db.sql("""update `tabBOM Item` set description = %s where
+ item_code = %s and docstatus < 2""",(self.description, self.name))
+ frappe.db.sql("""update `tabBOM Explosion Item` set description = %s where
+ item_code = %s and docstatus < 2""",(self.description, self.name))
+
+ def update_variants(self):
+ if self.has_variants:
+ updated = []
+ variants = frappe.db.get_all("Item", fields=["item_code"], filters={"variant_of": self.name })
+ for d in variants:
+ update_variant(self.name, d)
+ updated.append(d.item_code)
+ frappe.msgprint(_("Item Variants {0} updated").format(", ".join(updated)))
+
+ def validate_has_variants(self):
+ if not self.has_variants and frappe.db.get_value("Item", self.name, "has_variants"):
+ if frappe.db.exists("Item", {"variant_of": self.name}):
+ frappe.throw(_("Item has variants."))
+ def validate_stock_for_template_must_be_zero(self):
+ if self.has_variants:
+ stock_in = frappe.db.sql_list("""select warehouse from tabBin
+ where item_code=%s and (ifnull(actual_qty, 0) > 0 or ifnull(ordered_qty, 0) > 0
+ or ifnull(reserved_qty, 0) > 0 or ifnull(indented_qty, 0) > 0 or ifnull(planned_qty, 0) > 0)""", self.name)
+ if stock_in:
+ frappe.throw(_("Item Template cannot have stock or Open Sales/Purchase/Production Orders."), ItemTemplateCannotHaveStock)
+
def validate_end_of_life(item_code, end_of_life=None, verbose=1):
if not end_of_life:
end_of_life = frappe.db.get_value("Item", item_code, "end_of_life")
@@ -561,3 +444,4 @@
if doc.get("old_item_group") and doc.get("old_item_group") != doc.item_group:
invalidate_cache_for(doc, doc.old_item_group)
+
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index c6beeff..6eaa492 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -14,3 +14,5 @@
}
}
};
+
+frappe.help.youtube_id["Item"] = "qXaEwld4_Ps";
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index a8f3583..9cf3c07 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -6,7 +6,7 @@
import frappe
from frappe.test_runner import make_test_records
-from erpnext.stock.doctype.item.item import WarehouseNotSet, DuplicateVariant, ItemTemplateCannotHaveStock
+from erpnext.stock.doctype.item.item import WarehouseNotSet, ItemTemplateCannotHaveStock
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
test_ignore = ["BOM"]
@@ -20,58 +20,14 @@
item.insert()
else:
item = frappe.get_doc("Item", item_code)
-
return item
-
- def test_duplicate_variant(self):
- item = frappe.copy_doc(test_records[11])
- item.append("variants", {"item_attribute": "Test Size", "item_attribute_value": "Small"})
- self.assertRaises(DuplicateVariant, item.insert)
-
+
def test_template_cannot_have_stock(self):
- item = self.get_item(10)
-
- se = make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, incoming_rate=1)
-
- item.has_variants = 1
- self.assertRaises(ItemTemplateCannotHaveStock, item.save)
-
- def test_variant_item_codes(self):
- item = self.get_item(11)
-
- variants = ['_Test Variant Item-S', '_Test Variant Item-M', '_Test Variant Item-L']
- self.assertEqual(item.get_variant_item_codes(), variants)
- for v in variants:
- self.assertTrue(frappe.db.get_value("Item", {"variant_of": item.name, "name": v}))
-
- item.append("variants", {"item_attribute": "Test Colour", "item_attribute_value": "Red"})
- item.append("variants", {"item_attribute": "Test Colour", "item_attribute_value": "Blue"})
- item.append("variants", {"item_attribute": "Test Colour", "item_attribute_value": "Green"})
-
- self.assertEqual(item.get_variant_item_codes(), ['_Test Variant Item-S-R',
- '_Test Variant Item-S-G', '_Test Variant Item-S-B',
- '_Test Variant Item-M-R', '_Test Variant Item-M-G',
- '_Test Variant Item-M-B', '_Test Variant Item-L-R',
- '_Test Variant Item-L-G', '_Test Variant Item-L-B'])
-
- self.assertEqual(item.variant_attributes['_Test Variant Item-L-R'], [['Test Size', 'Large'], ['Test Colour', 'Red']])
- self.assertEqual(item.variant_attributes['_Test Variant Item-S-G'], [['Test Size', 'Small'], ['Test Colour', 'Green']])
-
- # check stock entry cannot be made
- def test_stock_entry_cannot_be_made_for_template(self):
- item = self.get_item(11)
-
- se = frappe.new_doc("Stock Entry")
- se.purpose = "Material Receipt"
- se.append("items", {
- "item_code": item.name,
- "t_warehouse": "Stores - _TC",
- "qty": 1,
- "incoming_rate": 1
- })
- se.insert()
- self.assertRaises(ItemTemplateCannotHaveStock, se.submit)
-
+ item = self.get_item(10)
+ se = make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, incoming_rate=1)
+ item.has_variants = 1
+ self.assertRaises(ItemTemplateCannotHaveStock, item.save)
+
def test_default_warehouse(self):
item = frappe.copy_doc(test_records[0])
item.is_stock_item = "Yes"
@@ -88,7 +44,7 @@
"income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"cost_center": "_Test Cost Center 2 - _TC",
- "qty": 0.0,
+ "qty": 1.0,
"price_list_rate": 100.0,
"base_price_list_rate": 0.0,
"discount_percentage": 0.0,
diff --git a/erpnext/stock/doctype/item/test_records.json b/erpnext/stock/doctype/item/test_records.json
index dc095c6..86d581d 100644
--- a/erpnext/stock/doctype/item/test_records.json
+++ b/erpnext/stock/doctype/item/test_records.json
@@ -109,7 +109,7 @@
"stock_uom": "_Test UOM 1"
},
{
- "description": "_Test Sales BOM Item 5",
+ "description": "_Test Product Bundle Item 5",
"doctype": "Item",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"cost_center": "_Test Cost Center - _TC",
@@ -124,9 +124,9 @@
"is_service_item": "No",
"is_stock_item": "No",
"is_sub_contracted_item": "No",
- "item_code": "_Test Sales BOM Item",
+ "item_code": "_Test Product Bundle Item",
"item_group": "_Test Item Group Desktops",
- "item_name": "_Test Sales BOM Item",
+ "item_name": "_Test Product Bundle Item",
"stock_uom": "_Test UOM"
},
{
@@ -273,11 +273,6 @@
"item_name": "_Test Variant Item",
"stock_uom": "_Test UOM",
"has_variants": 1,
- "variants": [
- {"item_attribute": "Test Size", "item_attribute_value": "Small"},
- {"item_attribute": "Test Size", "item_attribute_value": "Medium"},
- {"item_attribute": "Test Size", "item_attribute_value": "Large"}
- ],
"apply_warehouse_wise_reorder_level": 1,
"reorder_levels": [
{
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 3b2bd0e..1824fb6 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -54,7 +54,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 0,
- "modified": "2015-02-05 05:11:39.794192",
+ "modified": "2015-07-13 05:28:20.561939",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Attribute",
@@ -74,7 +74,7 @@
"print": 0,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py
index d7c33a5..171e118 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.py
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.py
@@ -8,8 +8,14 @@
class ItemAttribute(Document):
def validate(self):
+ self.validate_duplication()
+ self.validate_attribute_values()
+
+
+ def validate_duplication(self):
values, abbrs = [], []
for d in self.item_attribute_values:
+ d.abbr = d.abbr.upper()
if d.attribute_value in values:
frappe.throw(_("{0} must appear only once").format(d.attribute_value))
values.append(d.attribute_value)
@@ -17,3 +23,14 @@
if d.abbr in abbrs:
frappe.throw(_("{0} must appear only once").format(d.abbr))
abbrs.append(d.abbr)
+
+ def validate_attribute_values(self):
+ attribute_values = []
+ for d in self.item_attribute_values:
+ attribute_values.append(d.attribute_value)
+
+ variant_attributes = frappe.db.sql("select DISTINCT attribute_value from `tabVariant Attribute` where attribute=%s", self.name)
+ if variant_attributes:
+ for d in variant_attributes:
+ if d[0] not in attribute_values:
+ frappe.throw(_("Attribute Value {0} cannot be removed from {1} as Item Variants exist with this Attribute.").format(d[0], self.name))
diff --git a/erpnext/stock/doctype/item_price/item_price.js b/erpnext/stock/doctype/item_price/item_price.js
index 1807cc8..56bd185 100644
--- a/erpnext/stock/doctype/item_price/item_price.js
+++ b/erpnext/stock/doctype/item_price/item_price.js
@@ -1,15 +1,18 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-$.extend(cur_frm.cscript, {
- onload: function () {
+frappe.ui.form.on("Item Price", {
+ onload: function (frm) {
// Fetch price list details
- cur_frm.add_fetch("price_list", "buying", "buying");
- cur_frm.add_fetch("price_list", "selling", "selling");
- cur_frm.add_fetch("price_list", "currency", "currency");
+ frm.add_fetch("price_list", "buying", "buying");
+ frm.add_fetch("price_list", "selling", "selling");
+ frm.add_fetch("price_list", "currency", "currency");
// Fetch item details
- cur_frm.add_fetch("item_code", "item_name", "item_name");
- cur_frm.add_fetch("item_code", "description", "item_description");
+ frm.add_fetch("item_code", "item_name", "item_name");
+ frm.add_fetch("item_code", "description", "item_description");
+
+ frm.set_df_property("bulk_import_help", "options",
+ '<a href="#data-import-tool/Item Price">' + __("Import in Bulk") + '</a>');
}
-});
\ No newline at end of file
+});
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index b8194d9..b4e84f1 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -100,13 +100,26 @@
"label": "Item Description",
"permlevel": 0,
"read_only": 1
+ },
+ {
+ "fieldname": "section_break_12",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "bulk_import_help",
+ "fieldtype": "HTML",
+ "label": "Bulk Import Help",
+ "permlevel": 0,
+ "precision": ""
}
],
"icon": "icon-flag",
"idx": 1,
"in_create": 0,
"istable": 0,
- "modified": "2015-03-03 01:05:09.876025",
+ "modified": "2015-05-26 03:15:02.324161",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Price",
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index 9575ce9..1d31f03 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -102,7 +102,7 @@
],
"icon": "icon-usd",
"is_submittable": 1,
- "modified": "2015-02-11 16:21:49.528566",
+ "modified": "2015-07-13 05:28:22.039577",
"modified_by": "Administrator",
"module": "Stock",
"name": "Landed Cost Voucher",
@@ -118,7 +118,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/stock/doctype/manage_variants/__init__.py b/erpnext/stock/doctype/manage_variants/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants/__init__.py
diff --git a/erpnext/stock/doctype/manage_variants/manage_variants.js b/erpnext/stock/doctype/manage_variants/manage_variants.js
new file mode 100644
index 0000000..edbfcd2
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants/manage_variants.js
@@ -0,0 +1,60 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.ui.form.on("Manage Variants", {
+ onload: function(frm) {
+ var df = frappe.meta.get_docfield("Variant Attribute", "attribute_value", "Manage Variants");
+ df.on_make = function(field) {
+ $(field.input_area).addClass("ui-front");
+ field.$input.autocomplete({
+ minLength: 0,
+ minChars: 0,
+ source: function(request, response) {
+ frappe.call({
+ method:"frappe.client.get_list",
+ args:{
+ doctype:"Item Attribute Value",
+ filters: [
+ ["parent","=", field.doc.attribute],
+ ["attribute_value", "like", request.term + "%"]
+ ],
+ fields: ["attribute_value"]
+ },
+ callback: function(r) {
+ response($.map(r.message, function(d) { return d.attribute_value; }));
+ }
+ });
+ },
+ select: function(event, ui) {
+ field.$input.val(ui.item.value);
+ field.$input.trigger("change");
+ }
+ });
+ }
+ },
+
+ refresh: function(frm) {
+ frm.disable_save();
+ frm.page.set_primary_action(__("Create Variants"), function() {
+ frappe.call({
+ method: "create_variants",
+ doc:frm.doc
+ })
+ });
+ },
+
+ onload_post_render: function(frm) {
+ frm.get_field("variants").grid.cannot_add_rows = true;
+ },
+
+ item_code:function(frm) {
+ return frappe.call({
+ method: "get_item_details",
+ doc:frm.doc,
+ callback: function(r) {
+ refresh_field('attributes');
+ refresh_field('variants');
+ }
+ })
+ }
+});
diff --git a/erpnext/stock/doctype/manage_variants/manage_variants.json b/erpnext/stock/doctype/manage_variants/manage_variants.json
new file mode 100644
index 0000000..ff4f436
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants/manage_variants.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "creation": "2015-05-19 05:39:59.345901",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "fields": [
+ {
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "label": "Item Code",
+ "options": "Item",
+ "permlevel": 0,
+ "precision": "",
+ "reqd": 1
+ },
+ {
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break",
+ "label": "Item Variant Attributes",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "allow_on_submit": 0,
+ "fieldname": "attributes",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Attributes",
+ "no_copy": 0,
+ "options": "Variant Attribute",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0
+ },
+ {
+ "fieldname": "generate_combinations",
+ "fieldtype": "Button",
+ "label": "Generate Combinations",
+ "options": "generate_combinations",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "label": "Item Variants",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "variants",
+ "fieldtype": "Table",
+ "label": "Variants",
+ "options": "Manage Variants Item",
+ "permlevel": 0,
+ "precision": ""
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "in_create": 1,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "modified": "2015-07-13 05:28:29.057918",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Manage Variants",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Item Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "read_only": 1,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/manage_variants/manage_variants.py b/erpnext/stock/doctype/manage_variants/manage_variants.py
new file mode 100644
index 0000000..4dcfb22
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants/manage_variants.py
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+import copy
+import json
+
+class DuplicateAttribute(frappe.ValidationError): pass
+
+class ManageVariants(Document):
+
+ def get_item_details(self):
+ self.clear_tables()
+ if self.item_code:
+ self.get_attributes()
+ self.get_variants()
+
+ def generate_combinations(self):
+ self.validate_attributes()
+ self.validate_template_item()
+ self.validate_attribute_values()
+ self.validate_attributes_are_unique()
+ self.get_variant_item_codes()
+
+ def create_variants(self):
+ self.sync_variants()
+
+ def clear_tables(self):
+ self.set('attributes', [])
+ self.set('variants', [])
+
+ def get_attributes(self):
+ attributes = {}
+ self.set('attributes', [])
+ for d in frappe.db.sql("""select attr.attribute, attr.attribute_value from `tabVariant Attribute` as attr,
+ `tabItem` as item where attr.parent = item.name and item.variant_of = %s""", self.item_code, as_dict=1):
+ attributes.setdefault(d.attribute, []).append(d.attribute_value)
+ for d in attributes:
+ attribute_values = set(attributes[d])
+ for value in attribute_values:
+ self.append('attributes',{"attribute": d, "attribute_value": value})
+
+ def get_variants(self):
+ variants = [d.name for d in frappe.get_all("Item",
+ filters={"variant_of":self.item_code})]
+ data = frappe.db.sql("""select parent, attribute, attribute_value from `tabVariant Attribute`""", as_dict=1)
+ for d in variants:
+ variant_attributes, attributes = "", []
+ for attribute in data:
+ if attribute.parent == d:
+ variant_attributes += attribute.attribute_value + " | "
+ attributes.append([attribute.attribute, attribute.attribute_value])
+ self.append('variants',{"variant": d, "variant_attributes": variant_attributes[: -3], "attributes": json.dumps(attributes)})
+
+ def validate_attributes(self):
+ if not self.attributes:
+ frappe.throw(_("Enter atleast one Attribute & its Value in Attribute table."))
+
+ def validate_template_item(self):
+ if not frappe.db.get_value("Item", self.item_code, "has_variants"):
+ frappe.throw(_("Selected Item cannot have Variants."))
+
+ if frappe.db.get_value("Item", self.item_code, "variant_of"):
+ frappe.throw(_("Item cannot be a variant of a variant"))
+
+ def validate_attribute_values(self):
+ attributes = {}
+ for t in frappe.db.get_all("Item Attribute Value", fields=["parent", "attribute_value"]):
+ attributes.setdefault(t.parent, []).append(t.attribute_value)
+
+ for d in self.attributes:
+ if d.attribute_value not in attributes.get(d.attribute):
+ frappe.throw(_("Attribute value {0} does not exist in Item Attribute Master.").format(d.attribute_value))
+
+ def validate_attributes_are_unique(self):
+ attributes = []
+ for d in self.attributes:
+ key = (d.attribute, d.attribute_value)
+ if key in attributes:
+ frappe.throw(_("{0} {1} is entered more than once in Attributes table")
+ .format(d.attribute, d.attribute_value), DuplicateAttribute)
+ attributes.append(key)
+
+ def get_variant_item_codes(self):
+ """Get all possible suffixes for variants"""
+ variant_dict = {}
+ self.set('variants', [])
+
+ for d in self.attributes:
+ variant_dict.setdefault(d.attribute, []).append(d.attribute_value)
+
+ all_attributes = [d.name for d in frappe.get_all("Item Attribute", order_by = "priority asc")]
+
+ # sort attributes by their priority
+ attributes = filter(None, map(lambda d: d if d in variant_dict else None, all_attributes))
+
+ def add_attribute_suffixes(item_code, my_attributes, attributes):
+ attr = frappe.get_doc("Item Attribute", attributes[0])
+ for value in attr.item_attribute_values:
+ if value.attribute_value in variant_dict[attr.name]:
+ _my_attributes = copy.deepcopy(my_attributes)
+ _my_attributes.append([attr.name, value.attribute_value])
+ if len(attributes) > 1:
+ add_attribute_suffixes(item_code + "-" + value.abbr, _my_attributes, attributes[1:])
+ else:
+ variant_attributes = ""
+ for d in _my_attributes:
+ variant_attributes += d[1] + " | "
+ self.append('variants', {"variant": item_code + "-" + value.abbr,
+ "attributes": json.dumps(_my_attributes), "variant_attributes": variant_attributes[: -3]})
+ add_attribute_suffixes(self.item_code, [], attributes)
+
+ def sync_variants(self):
+ variant_item_codes = []
+ item_variants_attributes = {}
+ inserted, updated, old_variant_name, new_variant_name, deleted = [], [], [], [], []
+
+ for v in self.variants:
+ variant_item_codes.append(v.variant)
+
+ existing_variants = [d.name for d in frappe.get_all("Item",
+ filters={"variant_of":self.item_code})]
+
+ for d in existing_variants:
+ attributes = []
+ for attribute in frappe.db.sql("""select attribute, attribute_value from `tabVariant Attribute` where parent = %s""", d):
+ attributes.append([attribute[0], attribute[1]])
+ item_variants_attributes.setdefault(d, []).append(attributes)
+
+ for existing_variant in existing_variants:
+ if existing_variant not in variant_item_codes:
+ att = item_variants_attributes[existing_variant][0]
+ for variant in self.variants:
+ if sorted(json.loads(variant.attributes) ,key=lambda x: x[0]) == \
+ sorted(att ,key=lambda x: x[0]):
+ rename_variant(existing_variant, variant.variant)
+ old_variant_name.append(existing_variant)
+ new_variant_name.append(variant.variant)
+
+ if existing_variant not in old_variant_name:
+ delete_variant(existing_variant)
+ deleted.append(existing_variant)
+
+ for item_code in variant_item_codes:
+ if item_code not in existing_variants:
+ if item_code not in new_variant_name:
+ make_variant(self.item_code, item_code, self.variants)
+ inserted.append(item_code)
+ else:
+ update_variant(self.item_code, item_code, self.variants)
+ updated.append(item_code)
+
+ if inserted:
+ frappe.msgprint(_("Item Variants {0} created").format(", ".join(inserted)))
+
+ if updated:
+ frappe.msgprint(_("Item Variants {0} updated").format(", ".join(updated)))
+
+ if old_variant_name:
+ frappe.msgprint(_("Item Variants {0} renamed").format(", ".join(old_variant_name)))
+
+ if deleted:
+ frappe.msgprint(_("Item Variants {0} deleted").format(", ".join(deleted)))
+
+def make_variant(item, variant_code, variant_attribute):
+ variant = frappe.new_doc("Item")
+ variant.item_code = variant_code
+ copy_attributes_to_variant(item, variant, variant_attribute, insert=True)
+ variant.insert()
+
+def update_variant(item, variant_code, variant_attribute=None):
+ variant = frappe.get_doc("Item", variant_code)
+ copy_attributes_to_variant(item, variant, variant_attribute, insert=True)
+ variant.save()
+
+def rename_variant(old_variant_code, new_variant_code):
+ frappe.rename_doc("Item", old_variant_code, new_variant_code)
+
+def delete_variant(variant_code):
+ frappe.delete_doc("Item", variant_code)
+
+def copy_attributes_to_variant(item, variant, variant_attribute=None, insert=False):
+ template = frappe.get_doc("Item", item)
+ from frappe.model import no_value_fields
+ for field in template.meta.fields:
+ if field.fieldtype not in no_value_fields and (insert or not field.no_copy)\
+ and field.fieldname not in ("item_code", "item_name"):
+ if variant.get(field.fieldname) != template.get(field.fieldname):
+ variant.set(field.fieldname, template.get(field.fieldname))
+ variant.item_name = template.item_name + variant.item_code[len(template.name):]
+ variant.variant_of = template.name
+ variant.has_variants = 0
+ variant.show_in_website = 0
+ if variant_attribute:
+ for d in variant_attribute:
+ if d.variant == variant.item_code:
+ variant.attributes= []
+ for a in json.loads(d.attributes):
+ variant.append('attributes', {"attribute": a[0], "attribute_value": a[1]})
+ if variant.attributes:
+ variant.description += "\n"
+ for d in variant.attributes:
+ variant.description += "<p>" + d.attribute + ": " + d.attribute_value + "</p>"
\ No newline at end of file
diff --git a/erpnext/stock/doctype/manage_variants/test_manage_variants.py b/erpnext/stock/doctype/manage_variants/test_manage_variants.py
new file mode 100644
index 0000000..6aa7f83
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants/test_manage_variants.py
@@ -0,0 +1,49 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import unittest
+import frappe
+
+from erpnext.stock.doctype.manage_variants.manage_variants import DuplicateAttribute
+
+class TestManageVariants(unittest.TestCase):
+ def test_variant_item_codes(self):
+ manage_variant = frappe.new_doc("Manage Variants")
+ manage_variant.update({
+ "item_code": "_Test Variant Item",
+ "attributes": [
+ {
+ "attribute": "Test Size",
+ "attribute_value": "Small"
+ },
+ {
+ "attribute": "Test Size",
+ "attribute_value": "Large"
+ }
+ ]
+ })
+ manage_variant.generate_combinations()
+ self.assertEqual(manage_variant.variants[0].variant, "_Test Variant Item-S")
+ self.assertEqual(manage_variant.variants[1].variant, "_Test Variant Item-L")
+
+ self.assertEqual(manage_variant.variants[0].variant_attributes, "Small")
+ self.assertEqual(manage_variant.variants[1].variant_attributes, "Large")
+ manage_variant.create_variants()
+
+ def test_attributes_are_unique(self):
+ manage_variant = frappe.new_doc("Manage Variants")
+ manage_variant.update({
+ "item_code": "_Test Variant Item",
+ "attributes": [
+ {
+ "attribute": "Test Size",
+ "attribute_value": "Small"
+ },
+ {
+ "attribute": "Test Size",
+ "attribute_value": "Small"
+ }
+ ]
+ })
+ self.assertRaises(DuplicateAttribute, manage_variant.generate_combinations)
diff --git a/erpnext/stock/doctype/manage_variants_item/__init__.py b/erpnext/stock/doctype/manage_variants_item/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants_item/__init__.py
diff --git a/erpnext/stock/doctype/manage_variants_item/manage_variants_item.json b/erpnext/stock/doctype/manage_variants_item/manage_variants_item.json
new file mode 100644
index 0000000..a8bb61d
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants_item/manage_variants_item.json
@@ -0,0 +1,76 @@
+{
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "",
+ "creation": "2015-05-19 05:55:31.155672",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Other",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "fieldname": "variant",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Variant",
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0
+ },
+ {
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "variant_attributes",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Variant Attributes",
+ "permlevel": 0,
+ "precision": "",
+ "read_only": 1
+ },
+ {
+ "fieldname": "attributes",
+ "fieldtype": "Text",
+ "hidden": 1,
+ "label": "attributes",
+ "permlevel": 0,
+ "precision": "",
+ "read_only": 1
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "",
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "modified": "2015-06-30 03:19:07.548196",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Manage Variants Item",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/manage_variants_item/manage_variants_item.py b/erpnext/stock/doctype/manage_variants_item/manage_variants_item.py
new file mode 100644
index 0000000..800888a
--- /dev/null
+++ b/erpnext/stock/doctype/manage_variants_item/manage_variants_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ManageVariantsItem(Document):
+ pass
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 9734512..8c808c7 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -132,21 +132,6 @@
"width": "100px"
},
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "150px",
- "reqd": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
"fieldname": "column_break2",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -236,7 +221,7 @@
"icon": "icon-ticket",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-02-20 05:07:33.215371",
+ "modified": "2015-07-13 05:28:25.935998",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
@@ -267,7 +252,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -283,7 +268,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js
index 293d960..390e222 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.js
+++ b/erpnext/stock/doctype/material_request/material_request_list.js
@@ -6,7 +6,13 @@
} else if(doc.docstatus==1 && flt(doc.per_ordered) < 100) {
return [__("Pending"), "orange", "per_ordered,<,100"];
} else if(doc.docstatus==1 && flt(doc.per_ordered) == 100) {
- return [__("Ordered"), "green", "per_ordered,=,100"];
+ if (doc.material_request_type == "Purchase") {
+ return [__("Ordered"), "green", "per_ordered,=,100"];
+ } else if (doc.material_request_type == "Material Transfer") {
+ return [__("Transfered"), "green", "per_ordered,=,100"];
+ } else if (doc.material_request_type == "Material Issue") {
+ return [__("Issued"), "green", "per_ordered,=,100"];
+ }
}
}
};
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 3b659e3..c4bebeb 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -48,7 +48,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -264,7 +264,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-02-19 01:07:00.695393",
+ "modified": "2015-06-02 14:19:45.611733",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 647ef2e..e7a75fe 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -13,9 +13,9 @@
class PackedItem(Document):
pass
-def get_sales_bom_items(item_code):
+def get_product_bundle_items(item_code):
return frappe.db.sql("""select t1.item_code, t1.qty, t1.uom
- from `tabSales BOM Item` t1, `tabSales BOM` t2
+ from `tabProduct Bundle Item` t1, `tabProduct Bundle` t2
where t2.new_item_code=%s and t1.parent = t2.name""", item_code, as_dict=1)
def get_packing_item_details(item):
@@ -58,14 +58,14 @@
def make_packing_list(obj, item_table_fieldname):
- """make packing list for sales bom item"""
+ """make packing list for Product Bundle item"""
if obj.get("_action") and obj._action == "update_after_submit": return
parent_items = []
for d in obj.get(item_table_fieldname):
- if frappe.db.get_value("Sales BOM", {"new_item_code": d.item_code}):
- for i in get_sales_bom_items(d.item_code):
+ if frappe.db.get_value("Product Bundle", {"new_item_code": d.item_code}):
+ for i in get_product_bundle_items(d.item_code):
update_packing_list_item(obj, i['item_code'], flt(i['qty'])*flt(d.qty), d.warehouse, d)
if [d.item_code, d.name] not in parent_items:
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 431ac9b..1ba25c9 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -197,7 +197,7 @@
"icon": "icon-suitcase",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-02-20 05:09:24.405911",
+ "modified": "2015-07-13 05:28:24.850528",
"modified_by": "Administrator",
"module": "Stock",
"name": "Packing Slip",
@@ -214,7 +214,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -245,7 +245,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -260,7 +260,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index f223293..6e344b6 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -418,7 +418,7 @@
"default": "Grand Total",
"fieldname": "apply_discount_on",
"fieldtype": "Select",
- "label": "Apply Discount On",
+ "label": "Apply Additional Discount On",
"options": "\nGrand Total\nNet Total",
"permlevel": 0,
"precision": "",
@@ -433,7 +433,7 @@
{
"fieldname": "discount_amount",
"fieldtype": "Currency",
- "label": "Discount Amount",
+ "label": "Additional Discount Amount",
"options": "currency",
"permlevel": 0,
"precision": "",
@@ -443,7 +443,7 @@
{
"fieldname": "base_discount_amount",
"fieldtype": "Currency",
- "label": "Discount Amount (Company Currency)",
+ "label": "Additional Discount Amount (Company Currency)",
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
@@ -854,7 +854,7 @@
"icon": "icon-truck",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-05-18 05:06:04.723299",
+ "modified": "2015-07-13 05:28:27.389559",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
@@ -870,7 +870,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
@@ -886,7 +886,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -928,7 +928,7 @@
{
"permlevel": 1,
"read": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"write": 1
}
],
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index e56cd1e..e782889 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -104,15 +104,8 @@
}
})
- if cint(frappe.defaults.get_global_default('maintain_same_rate')):
- super(PurchaseReceipt, self).validate_with_previous_doc({
- "Purchase Order Item": {
- "ref_dn_field": "prevdoc_detail_docname",
- "compare_fields": [["rate", "="]],
- "is_child_table": True
- }
- })
-
+ if cint(frappe.db.get_single_value('Buying Settings', 'maintain_same_rate')):
+ self.validate_rate_with_reference_doc([["Purchase Order", "prevdoc_docname", "prevdoc_detail_docname"]])
def po_required(self):
if frappe.db.get_value("Buying Settings", None, "po_required") == 'Yes':
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 7a2b9ae..f53f508 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5,6 +5,19 @@
"doctype": "DocType",
"fields": [
{
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "label": "Barcode",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
@@ -49,7 +62,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -191,10 +204,11 @@
"read_only": 0
},
{
+ "depends_on": "price_list_rate",
"fieldname": "discount_percentage",
"fieldtype": "Percent",
"in_list_view": 1,
- "label": "Discount %",
+ "label": "Discount on Price List Rate (%)",
"permlevel": 0,
"print_hide": 1,
"read_only": 0
@@ -641,7 +655,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-14 14:54:02.462587",
+ "modified": "2015-06-08 08:21:18.024324",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
diff --git a/erpnext/stock/doctype/sales_bom_item/README.md b/erpnext/stock/doctype/sales_bom_item/README.md
index 1e5c8a2..3dad9d9 100644
--- a/erpnext/stock/doctype/sales_bom_item/README.md
+++ b/erpnext/stock/doctype/sales_bom_item/README.md
@@ -1 +1 @@
-Child Item grouped in parent Sales BOM.
\ No newline at end of file
+Child Item grouped in parent Product Bundle.
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 9d31f09..8ffe7ed 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -151,19 +151,20 @@
},
{
"fieldname": "purchase_document_type",
- "fieldtype": "Select",
+ "fieldtype": "Link",
"label": "Creation Document Type",
"no_copy": 1,
- "options": "\nPurchase Receipt\nStock Entry\nSerial No",
+ "options": "DocType",
"permlevel": 0,
"read_only": 1
},
{
"fieldname": "purchase_document_no",
- "fieldtype": "Data",
+ "fieldtype": "Dynamic Link",
"hidden": 0,
"label": "Creation Document No",
"no_copy": 1,
+ "options": "purchase_document_type",
"permlevel": 0,
"read_only": 1
},
@@ -417,7 +418,7 @@
"icon": "icon-barcode",
"idx": 1,
"in_create": 0,
- "modified": "2015-02-20 05:08:12.961403",
+ "modified": "2015-07-13 05:28:27.961178",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
@@ -431,7 +432,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -445,7 +446,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"submit": 0,
"write": 0
},
@@ -459,7 +460,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
}
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 59a0667..bac5441 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -34,6 +34,9 @@
self.validate_item()
self.on_stock_ledger_entry()
+ valid_purchase_document_type = ("Purchase Receipt", "Stock Entry", "Serial No")
+ self.validate_value("purchase_document_type", "in", valid_purchase_document_type)
+
def set_maintenance_status(self):
if not self.warranty_expiry_date and not self.amc_expiry_date:
self.maintenance_status = None
@@ -177,7 +180,7 @@
where fieldname='serial_no' and fieldtype='Text'"""):
for item in frappe.db.sql("""select name, serial_no from `tab%s`
- where serial_no like '%%%s%%'""" % (dt[0], old)):
+ where serial_no like '%%%s%%'""" % (dt[0], frappe.db.escape(old))):
serial_nos = map(lambda i: i==old and new or i, item[1].split('\n'))
frappe.db.sql("""update `tab%s` set serial_no = %s
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index e954cf6..6958ea0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -43,7 +43,7 @@
return erpnext.queries.item({is_stock_item: "Yes"});
}
};
-
+
this.frm.set_query("purchase_order", function() {
return {
"filters": {
@@ -68,8 +68,13 @@
},
onload_post_render: function() {
+ var me = this;
cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
- this.set_default_account();
+ this.set_default_account(function() {
+ if(me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
+ cur_frm.script_manager.trigger("company");
+ }
+ });
},
refresh: function() {
@@ -102,7 +107,7 @@
this.clean_up();
},
- set_default_account: function() {
+ set_default_account: function(callback) {
var me = this;
if(cint(frappe.defaults.get_default("auto_accounting_for_stock")) && this.frm.doc.company) {
@@ -122,6 +127,7 @@
$.each(me.frm.doc.items || [], function(i, d) {
if(!d.expense_account) d.expense_account = r.message;
});
+ if(callback) callback();
}
}
});
@@ -405,14 +411,21 @@
var item = locals[cdt][cdn];
if(!item.item_code) {
frappe.throw(__("Please enter Item Code to get batch no"));
- } else {
- var filters = {
- 'item_code': item.item_code,
- 'posting_date': me.frm.doc.posting_date,
+ }
+ else {
+ if (in_list(["Material Transfer for Manufacture", "Manufacture", "Repack", "Subcontract"], doc.purpose)) {
+ var filters = {
+ 'item_code': item.item_code,
+ 'posting_date': me.frm.doc.posting_date || nowdate()
+ }
+ } else {
+ var filters = {
+ 'item_code': item.item_code
+ }
}
+
if(item.s_warehouse) filters["warehouse"] = item.s_warehouse
-
return {
query : "erpnext.controllers.queries.get_batch_no",
filters: filters
@@ -439,10 +452,11 @@
args: args,
callback: function(r) {
if(r.message) {
+ var d = locals[cdt][cdn];
$.each(r.message, function(k, v) {
- frappe.model.set_value(cdt, cdn, k, v);
+ d[k] = v;
});
- refresh_field('image_view', d.name, 'items');
+ refresh_field("items");
}
}
});
@@ -491,9 +505,9 @@
}
cur_frm.cscript.validate = function(doc, cdt, cdn) {
- cur_frm.cscript.validate_items(doc);
if($.inArray(cur_frm.doc.purpose, ["Purchase Return", "Sales Return"])!==-1)
validated = cur_frm.cscript.get_doctype_docname() ? true : false;
+ cur_frm.cscript.validate_items(doc);
}
cur_frm.cscript.validate_items = function(doc) {
@@ -505,11 +519,11 @@
}
cur_frm.cscript.expense_account = function(doc, cdt, cdn) {
- cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "expense_account");
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "expense_account");
}
cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
- cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "cost_center");
+ erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "cost_center");
}
cur_frm.fields_dict.customer.get_query = function(doc, cdt, cdn) {
@@ -521,7 +535,14 @@
}
cur_frm.cscript.company = function(doc, cdt, cdn) {
- erpnext.get_fiscal_year(doc.company, doc.posting_date);
+ if(doc.company) {
+ erpnext.get_fiscal_year(doc.company, doc.posting_date, function() {
+ var company_doc = frappe.get_doc(":Company", doc.company);
+ if(company_doc.default_letter_head) {
+ cur_frm.set_value("letter_head", company_doc.default_letter_head);
+ }
+ });
+ }
}
cur_frm.cscript.posting_date = function(doc, cdt, cdn){
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 126da73..06dec58 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -633,6 +633,14 @@
"search_index": 0
},
{
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"allow_on_submit": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
@@ -670,7 +678,7 @@
"is_submittable": 1,
"issingle": 0,
"max_attachments": 0,
- "modified": "2015-03-03 18:09:12.035606",
+ "modified": "2015-07-13 05:28:26.085266",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
@@ -687,7 +695,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"share": 1,
"submit": 1,
"write": 1
@@ -733,7 +741,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"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 0196c31..fb1ec3d 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -5,7 +5,7 @@
import frappe
import frappe.defaults
-from frappe.utils import cstr, cint, flt, comma_or, nowdate, get_datetime
+from frappe.utils import cstr, cint, flt, comma_or, get_datetime, getdate
from frappe import _
from erpnext.stock.utils import get_incoming_rate
@@ -66,6 +66,7 @@
self.validate_valuation_rate()
self.set_total_incoming_outgoing_value()
self.set_total_amount()
+ self.validate_batch()
def on_submit(self):
self.update_stock_ledger()
@@ -112,7 +113,7 @@
for f in ("uom", "stock_uom", "description", "item_name", "expense_account",
"cost_center", "conversion_factor"):
- if f not in ["expense_account", "cost_center"] or not item.get(f):
+ if f in ["stock_uom", "conversion_factor"] or not item.get(f):
item.set(f, item_details.get(f))
if self.difference_account:
@@ -190,6 +191,8 @@
frappe.throw(_("Production order number is mandatory for stock entry purpose manufacture"))
# check for double entry
if self.purpose=="Manufacture":
+ if not self.fg_completed_qty:
+ frappe.throw(_("For Quantity (Manufactured Qty) is mandatory"))
self.check_if_operations_completed()
self.check_duplicate_entry_for_production_order()
elif self.purpose != "Material Transfer":
@@ -198,6 +201,9 @@
def check_if_operations_completed(self):
"""Check if Time Logs are completed against before manufacturing to capture operating costs."""
prod_order = frappe.get_doc("Production Order", self.production_order)
+ if not prod_order.track_operations:
+ return
+
for d in prod_order.get("operations"):
total_completed_qty = flt(self.fg_completed_qty) + flt(prod_order.produced_qty)
if total_completed_qty > flt(d.completed_qty):
@@ -357,8 +363,11 @@
if self.purpose == "Subcontract" and self.purchase_order:
purchase_order = frappe.get_doc("Purchase Order", self.purchase_order)
for se_item in self.items:
- total_allowed = [d.required_qty for d in purchase_order.supplied_items \
- if d.rm_item_code == se_item.item_code][0]
+ total_allowed = sum([flt(d.required_qty) for d in purchase_order.supplied_items \
+ if d.rm_item_code == se_item.item_code])
+ if not total_allowed:
+ frappe.throw(_("Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1}")
+ .format(se_item.item_code, self.purchase_order))
total_supplied = frappe.db.sql("""select sum(qty)
from `tabStock Entry Detail`, `tabStock Entry`
where `tabStock Entry`.purchase_order = %s
@@ -378,10 +387,21 @@
def validate_finished_goods(self):
"""validation: finished good quantity should be same as manufacturing quantity"""
+ items_with_target_warehouse = []
for d in self.get('items'):
if d.bom_no and flt(d.transfer_qty) != flt(self.fg_completed_qty):
frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
format(d.idx, d.transfer_qty, self.fg_completed_qty))
+
+ if self.production_order and self.purpose == "Manufacture" and d.t_warehouse:
+ items_with_target_warehouse.append(d.item_code)
+
+ if self.production_order and self.purpose == "Manufacture":
+ production_item = frappe.db.get_value("Production Order",
+ self.production_order, "production_item")
+ if production_item not in items_with_target_warehouse:
+ frappe.throw(_("Finished Item {0} must be entered for Manufacture type entry")
+ .format(production_item))
def validate_return_reference_doc(self):
"""validate item with reference doc"""
@@ -399,7 +419,6 @@
# posting date check
ref_posting_datetime = "%s %s" % (ref.doc.posting_date, ref.doc.posting_time or "00:00:00")
- this_posting_datetime = "%s %s" % (self.posting_date, self.posting_time)
if get_datetime(ref_posting_datetime) < get_datetime(ref_posting_datetime):
from frappe.utils.dateutils import datetime_in_user_format
@@ -474,9 +493,10 @@
pro_doc = frappe.get_doc("Production Order", self.production_order)
_validate_production_order(pro_doc)
pro_doc.run_method("update_status")
- pro_doc.run_method("update_production_order_qty")
- if self.purpose == "Manufacture":
- self.update_planned_qty(pro_doc)
+ if self.fg_completed_qty:
+ pro_doc.run_method("update_production_order_qty")
+ if self.purpose == "Manufacture":
+ self.update_planned_qty(pro_doc)
def update_planned_qty(self, pro_doc):
from erpnext.stock.utils import update_bin
@@ -546,9 +566,6 @@
return ret
def get_items(self):
- if not self.fg_completed_qty or not self.bom_no:
- frappe.throw(_("BOM and Manufacturing Quantity are required"))
-
self.set('items', [])
self.validate_production_order()
@@ -638,17 +655,16 @@
issued_item_qty = self.get_issued_qty()
max_qty = flt(self.pro_doc.qty)
- only_pending_fetched = []
-
for item in item_dict:
pending_to_issue = (max_qty * item_dict[item]["qty"]) - issued_item_qty.get(item, 0)
desire_to_transfer = flt(self.fg_completed_qty) * item_dict[item]["qty"]
+
if desire_to_transfer <= pending_to_issue:
item_dict[item]["qty"] = desire_to_transfer
- else:
+ elif pending_to_issue > 0:
item_dict[item]["qty"] = pending_to_issue
- if pending_to_issue:
- only_pending_fetched.append(item)
+ else:
+ item_dict[item]["qty"] = 0
# delete items with 0 qty
for item in item_dict.keys():
@@ -659,9 +675,6 @@
if not len(item_dict):
frappe.msgprint(_("""All items have already been transferred for this Production Order."""))
- elif only_pending_fetched:
- frappe.msgprint(_("Pending Items {0} updated").format(only_pending_fetched))
-
return item_dict
def get_issued_qty(self):
@@ -715,6 +728,15 @@
mreq_item.warehouse != (item.s_warehouse if self.purpose== "Material Issue" else item.t_warehouse):
frappe.throw(_("Item or Warehouse for row {0} does not match Material Request").format(item.idx),
frappe.MappingMismatchError)
+
+ def validate_batch(self):
+ if self.purpose in ["Material Transfer for Manufacture", "Manufacture", "Repack", "Subcontract"]:
+ for item in self.get("items"):
+ if item.batch_no:
+ expiry_date = frappe.db.get_value("Batch", item.batch_no, "expiry_date")
+ if expiry_date:
+ if getdate(self.posting_date) > getdate(expiry_date):
+ frappe.throw(_("Batch {0} of Item {1} has expired.").format(item.batch_no, item.item_code))
@frappe.whitelist()
def get_party_details(ref_dt, ref_dn):
@@ -853,8 +875,6 @@
"account": r.get("account"),
"party_type": r.get("party_type"),
"party": r.get("party"),
- "against_invoice": r.get("against_invoice"),
- "against_voucher": r.get("against_voucher"),
"balance": get_balance_on(r.get("account"), se.posting_date) if r.get("account") else 0
})
@@ -865,8 +885,7 @@
parent = {
"account": ref.doc.debit_to,
"party_type": "Customer",
- "party": ref.doc.customer,
- "against_invoice": ref.doc.name,
+ "party": ref.doc.customer
}
# income account entries
@@ -940,9 +959,6 @@
break
- if len(invoices_against_delivery) == 1:
- parent["against_invoice"] = invoices_against_delivery[0]
-
result = [parent] + [{"account": account} for account in children]
return result
@@ -998,9 +1014,6 @@
break
- if len(invoice_against_receipt) == 1:
- parent["against_voucher"] = invoice_against_receipt[0]
-
result = [parent] + [{"account": account} for account in children]
return result
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 399589d..70d6413 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -72,6 +72,19 @@
self._test_auto_material_request("_Test Item")
def test_auto_material_request_for_variant(self):
+ manage_variant = frappe.new_doc("Manage Variants")
+
+ manage_variant.update({
+ "item_code": "_Test Variant Item",
+ "attributes": [
+ {
+ "attribute": "Test Size",
+ "attribute_value": "Small"
+ }
+ ]
+ })
+ manage_variant.generate_combinations()
+ manage_variant.create_variants()
self._test_auto_material_request("_Test Variant Item-S")
def _test_auto_material_request(self, item_code):
@@ -81,17 +94,21 @@
template = frappe.get_doc("Item", item.variant_of)
else:
template = item
+
+ projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code,
+ "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or [0, 0]
# stock entry reqd for auto-reorder
create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC",
- qty=10, rate=100)
-
- frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
+ qty = actual_qty + abs(projected_qty) + 10, rate=100)
+
projected_qty = frappe.db.get_value("Bin", {"item_code": item_code,
"warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0
-
+
+ frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
+
# update re-level qty so that it is more than projected_qty
- if projected_qty > template.reorder_levels[0].warehouse_reorder_level:
+ if projected_qty >= template.reorder_levels[0].warehouse_reorder_level:
template.reorder_levels[0].warehouse_reorder_level += projected_qty
template.save()
@@ -329,7 +346,7 @@
self._test_sales_invoice_return("_Test Item", 5, 2)
def test_sales_invoice_return_of_packing_item(self):
- self._test_sales_invoice_return("_Test Sales BOM Item", 25, 20)
+ self._test_sales_invoice_return("_Test Product Bundle Item", 25, 20)
def _test_delivery_note_return(self, item_code, delivered_qty, returned_qty):
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
@@ -364,7 +381,7 @@
self._test_delivery_note_return("_Test Item", 5, 2)
def test_delivery_note_return_of_packing_item(self):
- self._test_delivery_note_return("_Test Sales BOM Item", 25, 20)
+ self._test_delivery_note_return("_Test Product Bundle Item", 25, 20)
def _test_sales_return_jv(self, se):
jv = make_return_jv(se.name)
@@ -375,7 +392,6 @@
self.assertEqual(jv.get("accounts")[0].get("account"), "Debtors - _TC")
self.assertEqual(jv.get("accounts")[0].get("party_type"), "Customer")
self.assertEqual(jv.get("accounts")[0].get("party"), "_Test Customer")
- self.assertTrue(jv.get("accounts")[0].get("against_invoice"))
self.assertEqual(jv.get("accounts")[1].get("account"), "Sales - _TC")
def test_make_return_jv_for_sales_invoice_non_packing_item(self):
@@ -383,7 +399,7 @@
self._test_sales_return_jv(se)
def test_make_return_jv_for_sales_invoice_packing_item(self):
- se = self._test_sales_invoice_return("_Test Sales BOM Item", 25, 20)
+ se = self._test_sales_invoice_return("_Test Product Bundle Item", 25, 20)
self._test_sales_return_jv(se)
def test_make_return_jv_for_delivery_note_non_packing_item(self):
@@ -394,10 +410,10 @@
self._test_sales_return_jv(se)
def test_make_return_jv_for_delivery_note_packing_item(self):
- se = self._test_delivery_note_return("_Test Sales BOM Item", 25, 20)
+ se = self._test_delivery_note_return("_Test Product Bundle Item", 25, 20)
self._test_sales_return_jv(se)
- se = self._test_delivery_note_return_against_sales_order("_Test Sales BOM Item", 25, 20)
+ se = self._test_delivery_note_return_against_sales_order("_Test Product Bundle Item", 25, 20)
self._test_sales_return_jv(se)
def _test_delivery_note_return_against_sales_order(self, item_code, delivered_qty, returned_qty):
@@ -480,7 +496,6 @@
self.assertEqual(jv.get("accounts")[0].get("account"), "_Test Payable - _TC")
self.assertEqual(jv.get("accounts")[0].get("party"), "_Test Supplier")
self.assertEqual(jv.get("accounts")[1].get("account"), "_Test Account Cost for Goods Sold - _TC")
- self.assertTrue(jv.get("accounts")[0].get("against_voucher"))
def test_make_return_jv_for_purchase_receipt(self):
se, pr_name = self.test_purchase_receipt_return()
@@ -689,7 +704,7 @@
def test_warehouse_company_validation(self):
set_perpetual_inventory(0)
frappe.get_doc("User", "test2@example.com")\
- .add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
+ .add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager")
frappe.set_user("test2@example.com")
from erpnext.stock.utils import InvalidWarehouseCompany
@@ -705,11 +720,11 @@
frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com", "User Permission")
frappe.defaults.add_default("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com", "User Permission")
test_user = frappe.get_doc("User", "test@example.com")
- test_user.add_roles("Sales User", "Sales Manager", "Material User")
- test_user.remove_roles("Material Manager")
+ test_user.add_roles("Sales User", "Sales Manager", "Stock User")
+ test_user.remove_roles("Stock Manager")
frappe.get_doc("User", "test2@example.com")\
- .add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
+ .add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager")
frappe.set_user("test@example.com")
st1 = frappe.copy_doc(test_records[0])
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 fb654c2..a373185 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -100,7 +100,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -344,7 +344,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-02-25 04:31:21.801200",
+ "modified": "2015-07-02 05:32:56.511570",
"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 f6bd010..780bcc9 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -266,7 +266,7 @@
"icon": "icon-list",
"idx": 1,
"in_create": 1,
- "modified": "2014-06-23 08:07:56.370276",
+ "modified": "2015-07-13 05:28:27.826340",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
@@ -280,7 +280,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
},
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 97e7c20..ff027d7 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -14,9 +14,11 @@
class StockLedgerEntry(Document):
def validate(self):
+ self.flags.ignore_submit_comment = True
from erpnext.stock.utils import validate_warehouse_company
self.validate_mandatory()
self.validate_item()
+ self.validate_batch()
validate_warehouse_company(self.warehouse, self.company)
self.scrub_posting_time()
@@ -95,6 +97,13 @@
def scrub_posting_time(self):
if not self.posting_time or self.posting_time == '00:0':
self.posting_time = '00:00'
+
+ def validate_batch(self):
+ if self.batch_no and self.voucher_type != "Stock Entry":
+ expiry_date = frappe.db.get_value("Batch", self.batch_no, "expiry_date")
+ if expiry_date:
+ if getdate(self.posting_date) > getdate(expiry_date):
+ frappe.throw(_("Batch {0} of Item {1} has expired.").format(self.batch_no, self.item_code))
def on_doctype_update():
if not frappe.db.sql("""show index from `tabStock Ledger Entry`
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 763680f..72d0f66 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -67,7 +67,8 @@
"label": "Items",
"options": "Stock Reconciliation Item",
"permlevel": 0,
- "precision": ""
+ "precision": "",
+ "reqd": 1
},
{
"fieldname": "get_items",
@@ -148,7 +149,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 1,
- "modified": "2015-02-20 04:39:46.585018",
+ "modified": "2015-07-13 05:28:29.255124",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation",
@@ -162,7 +163,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 5614ee2..413f820 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -227,7 +227,7 @@
msgprint(_("Please enter Expense Account"), raise_exception=1)
elif not frappe.db.sql("""select name from `tabStock Ledger Entry` limit 1"""):
if frappe.db.get_value("Account", self.expense_account, "report_type") == "Profit and Loss":
- frappe.throw(_("Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError)
+ frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError)
def get_items_for(self, warehouse):
self.items = []
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 0d3288c..eaa82dd 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -97,7 +97,8 @@
sr.posting_time = args.posting_time or nowtime()
sr.company = args.company or "_Test Company"
sr.fiscal_year = get_fiscal_year(sr.posting_date)[0]
- sr.expense_account = args.expense_account or "Stock Adjustment - _TC"
+ sr.expense_account = args.expense_account or \
+ ("Stock Adjustment - _TC" if frappe.get_all("Stock Ledger Entry") else "Temporary Opening - _TC")
sr.cost_center = args.cost_center or "_Test Cost Center - _TC"
sr.append("items", {
"item_code": args.item_code or "_Test Item",
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 2a8b54c..4907e45 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -103,7 +103,7 @@
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
- "modified": "2015-02-18 08:37:18.229705",
+ "modified": "2015-07-13 05:28:23.839277",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",
@@ -115,7 +115,7 @@
"permlevel": 0,
"print": 1,
"read": 1,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"write": 1
}
diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
index 9782606..3747f5c 100644
--- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
+++ b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
@@ -43,7 +43,7 @@
"idx": 1,
"in_create": 0,
"issingle": 1,
- "modified": "2015-02-05 05:11:47.290476",
+ "modified": "2015-07-13 05:28:25.689187",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock UOM Replace Utility",
@@ -56,7 +56,7 @@
"print": 1,
"read": 1,
"report": 0,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -68,7 +68,7 @@
"print": 1,
"read": 1,
"report": 0,
- "role": "Material Manager",
+ "role": "Stock Manager",
"share": 1,
"submit": 0,
"write": 1
diff --git a/erpnext/stock/doctype/variant_attribute/__init__.py b/erpnext/stock/doctype/variant_attribute/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/doctype/variant_attribute/__init__.py
diff --git a/erpnext/stock/doctype/variant_attribute/variant_attribute.json b/erpnext/stock/doctype/variant_attribute/variant_attribute.json
new file mode 100644
index 0000000..5ab3d73
--- /dev/null
+++ b/erpnext/stock/doctype/variant_attribute/variant_attribute.json
@@ -0,0 +1,78 @@
+{
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "",
+ "creation": "2015-05-19 05:12:30.344797",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Other",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "fieldname": "attribute",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Attribute",
+ "no_copy": 0,
+ "options": "Item Attribute",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0
+ },
+ {
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "allow_on_submit": 0,
+ "fieldname": "attribute_value",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Attribute Value",
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "",
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "modified": "2015-05-20 06:16:16.803578",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Variant Attribute",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/variant_attribute/variant_attribute.py b/erpnext/stock/doctype/variant_attribute/variant_attribute.py
new file mode 100644
index 0000000..9c35732
--- /dev/null
+++ b/erpnext/stock/doctype/variant_attribute/variant_attribute.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class VariantAttribute(Document):
+ pass
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index e9bb900..670aa1b 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -151,7 +151,7 @@
],
"icon": "icon-building",
"idx": 1,
- "modified": "2015-02-05 05:11:48.803063",
+ "modified": "2015-07-13 05:28:25.214824",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
@@ -166,7 +166,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material Master Manager",
+ "role": "Item Manager",
"share": 1,
"submit": 0,
"write": 1
@@ -181,7 +181,7 @@
"print": 1,
"read": 1,
"report": 1,
- "role": "Material User",
+ "role": "Stock User",
"submit": 0,
"write": 0
},
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 3c820fa..399946b 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -51,7 +51,7 @@
get_price_list_rate(args, item_doc, out)
if args.transaction_type == "selling" and cint(args.is_pos):
- out.update(get_pos_settings_item_details(args.company, args))
+ out.update(get_pos_profiles_item_details(args.company, args))
# update args with out, if key or value not exists
for key, value in out.iteritems():
@@ -163,8 +163,8 @@
"uom": item.stock_uom,
"min_order_qty": flt(item.min_order_qty) if args.parenttype == "Material Request" else "",
"conversion_factor": 1.0,
- "qty": args.qty or 0.0,
- "stock_qty": 0.0,
+ "qty": args.qty or 1.0,
+ "stock_qty": 1.0,
"price_list_rate": 0.0,
"base_price_list_rate": 0.0,
"rate": 0.0,
@@ -267,16 +267,16 @@
item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier})
out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None
-def get_pos_settings_item_details(company, args, pos_settings=None):
+def get_pos_profiles_item_details(company, args, pos_profiles=None):
res = frappe._dict()
- if not pos_settings:
- pos_settings = get_pos_settings(company)
+ if not pos_profiles:
+ pos_profiles = get_pos_profiles(company)
- if pos_settings:
+ if pos_profiles:
for fieldname in ("income_account", "cost_center", "warehouse", "expense_account"):
- if not args.get(fieldname) and pos_settings.get(fieldname):
- res[fieldname] = pos_settings.get(fieldname)
+ if not args.get(fieldname) and pos_profiles.get(fieldname):
+ res[fieldname] = pos_profiles.get(fieldname)
if res.get("warehouse"):
res.actual_qty = get_available_qty(args.item_code,
@@ -284,15 +284,15 @@
return res
-def get_pos_settings(company):
- pos_settings = frappe.db.sql("""select * from `tabPOS Setting` where user = %s
+def get_pos_profiles(company):
+ pos_profiles = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
and company = %s""", (frappe.session['user'], company), as_dict=1)
- if not pos_settings:
- pos_settings = frappe.db.sql("""select * from `tabPOS Setting`
+ if not pos_profiles:
+ pos_profiles = frappe.db.sql("""select * from `tabPOS Profile`
where ifnull(user,'') = '' and company = %s""", company, as_dict=1)
- return pos_settings and pos_settings[0] or None
+ return pos_profiles and pos_profiles[0] or None
def get_serial_nos_by_fifo(args, item_doc):
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 61abe3b..f739f94 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -3,18 +3,14 @@
import frappe
from frappe.utils import flt, cstr, nowdate, add_days, cint
-from erpnext.accounts.utils import get_fiscal_year, FiscalYearError
def reorder_item():
""" Reorder item if stock reaches reorder level"""
# if initial setup not completed, return
- if not frappe.db.sql("select name from `tabFiscal Year` limit 1"):
+ if not (frappe.db.a_row_exists("Company") and frappe.db.a_row_exists("Fiscal Year")):
return
- if getattr(frappe.local, "auto_indent", None) is None:
- frappe.local.auto_indent = cint(frappe.db.get_value('Stock Settings', None, 'auto_indent'))
-
- if frappe.local.auto_indent:
+ if cint(frappe.db.get_value('Stock Settings', None, 'auto_indent')):
return _reorder_item()
def _reorder_item():
@@ -86,7 +82,6 @@
def create_material_request(material_requests):
""" Create indent on reaching reorder level """
mr_list = []
- defaults = frappe.defaults.get_defaults()
exceptions_list = []
def _log_exception():
@@ -96,14 +91,6 @@
else:
exceptions_list.append(frappe.get_traceback())
- try:
- current_fiscal_year = get_fiscal_year(nowdate())[0] or defaults.fiscal_year
-
- except FiscalYearError:
- _log_exception()
- notify_errors(exceptions_list)
- return
-
for request_type in material_requests:
for company in material_requests[request_type]:
try:
@@ -114,7 +101,6 @@
mr = frappe.new_doc("Material Request")
mr.update({
"company": company,
- "fiscal_year": current_fiscal_year,
"transaction_date": nowdate(),
"material_request_type": request_type
})
@@ -161,7 +147,7 @@
email_list = frappe.db.sql_list("""select distinct r.parent
from tabUserRole r, tabUser p
where p.name = r.parent and p.enabled = 1 and p.docstatus < 2
- and r.role in ('Purchase Manager','Material Manager')
+ and r.role in ('Purchase Manager','Stock Manager')
and p.name not in ('Administrator', 'All', 'Guest')""")
msg="""<h3>Following Material Requests has been raised automatically \
@@ -173,7 +159,7 @@
msg += "<tr><td>" + item.item_code + "</td><td>" + item.warehouse + "</td><td>" + \
cstr(item.qty) + "</td><td>" + cstr(item.uom) + "</td></tr>"
msg += "</table>"
- frappe.sendmail(recipients=email_list,
+ frappe.sendmail(recipients=email_list,
subject='Auto Material Request Generation Notification', message = msg)
def notify_errors(exceptions_list):
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 d911975..9cba203 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
@@ -20,10 +20,11 @@
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,
- flt(qty_dict.opening_qty, float_precision), flt(qty_dict.in_qty, float_precision),
- flt(qty_dict.out_qty, float_precision), flt(qty_dict.bal_qty, float_precision)
- ])
+ if qty_dict.opening_qty or qty_dict.in_qty or qty_dict.out_qty or qty_dict.bal_qty:
+ data.append([item, item_map[item]["item_name"], item_map[item]["description"], wh, batch,
+ flt(qty_dict.opening_qty, float_precision), flt(qty_dict.in_qty, float_precision),
+ flt(qty_dict.out_qty, float_precision), flt(qty_dict.bal_qty, float_precision)
+ ])
return columns, data
@@ -54,7 +55,7 @@
return frappe.db.sql("""select item_code, batch_no, warehouse,
posting_date, actual_qty
from `tabStock Ledger Entry`
- where docstatus < 2 %s order by item_code, warehouse""" %
+ where docstatus < 2 and ifnull(batch_no, '') != '' %s order by item_code, warehouse""" %
conditions, as_dict=1)
def get_item_warehouse_batch_map(filters, float_precision):
diff --git a/erpnext/stock/report/bom_search/__init__.py b/erpnext/stock/report/bom_search/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/report/bom_search/__init__.py
diff --git a/erpnext/stock/report/bom_search/bom_search.js b/erpnext/stock/report/bom_search/bom_search.js
new file mode 100644
index 0000000..e9e763c
--- /dev/null
+++ b/erpnext/stock/report/bom_search/bom_search.js
@@ -0,0 +1,42 @@
+// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and Contributors and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["BOM Search"] = {
+ "filters": [
+ {
+ fieldname: "item1",
+ label: __("Item 1"),
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ fieldname: "item2",
+ label: __("Item 2"),
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ fieldname: "item3",
+ label: __("Item 3"),
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ fieldname: "item4",
+ label: __("Item 4"),
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ fieldname: "item5",
+ label: __("Item 5"),
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ fieldname: "search_sub_assemblies",
+ label: __("Search Sub Assemblies"),
+ fieldtype: "Check",
+ },
+ ]
+}
diff --git a/erpnext/stock/report/bom_search/bom_search.json b/erpnext/stock/report/bom_search/bom_search.json
new file mode 100644
index 0000000..2857c17
--- /dev/null
+++ b/erpnext/stock/report/bom_search/bom_search.json
@@ -0,0 +1,17 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 0,
+ "creation": "2015-06-16 15:16:11.930954",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "modified": "2015-06-16 15:16:29.850834",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "BOM Search",
+ "owner": "Administrator",
+ "ref_doctype": "BOM",
+ "report_name": "BOM Search",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/bom_search/bom_search.py b/erpnext/stock/report/bom_search/bom_search.py
new file mode 100644
index 0000000..828ae16
--- /dev/null
+++ b/erpnext/stock/report/bom_search/bom_search.py
@@ -0,0 +1,43 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+
+def execute(filters=None):
+ data = []
+ parents = {
+ "Product Bundle Item": "Product Bundle",
+ "BOM Explosion Item": "BOM",
+ "BOM Item": "BOM"
+ }
+
+ for doctype in ("Product Bundle Item",
+ "BOM Explosion Item" if filters.search_sub_assemblies else "BOM Item"):
+ all_boms = {}
+ for d in frappe.get_all(doctype, fields=["parent", "item_code"]):
+ all_boms.setdefault(d.parent, []).append(d.item_code)
+
+ for parent, items in all_boms.iteritems():
+ valid = True
+ for key, item in filters.iteritems():
+ if key != "search_sub_assemblies":
+ if item and item not in items:
+ valid = False
+
+ if valid:
+ data.append((parent, parents[doctype]))
+
+ return [{
+ "fieldname": "parent",
+ "label": "BOM",
+ "width": 200,
+ "fieldtype": "Dynamic Link",
+ "options": "doctype"
+ },
+ {
+ "fieldname": "doctype",
+ "label": "Type",
+ "width": 200,
+ "fieldtype": "Data"
+ }], data
diff --git a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
index a32e363..3a18daf 100644
--- a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
+++ b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
@@ -5,12 +5,12 @@
"doctype": "Report",
"idx": 1,
"is_standard": "Yes",
- "modified": "2015-04-07 08:18:14.440193",
+ "modified": "2015-06-10 15:52:49.492144",
"modified_by": "Administrator",
"module": "Stock",
"name": "Ordered Items To Be Delivered",
"owner": "Administrator",
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`, `tabBin`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\n and `tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse\norder by `tabSales Order`.transaction_date asc",
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order`, `tabSales Order Item`, `tabBin`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\n and `tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse\norder by `tabSales Order`.transaction_date asc",
"ref_doctype": "Delivery Note",
"report_name": "Ordered Items To Be Delivered",
"report_type": "Query Report"
diff --git a/erpnext/stock/report/stock_balance/stock_balance.json b/erpnext/stock/report/stock_balance/stock_balance.json
index ab331dc..5f7fde0 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.json
+++ b/erpnext/stock/report/stock_balance/stock_balance.json
@@ -1,12 +1,12 @@
{
- "add_total_row": 0,
+ "add_total_row": 1,
"apply_user_permissions": 1,
"creation": "2014-10-10 17:58:11.577901",
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"is_standard": "Yes",
- "modified": "2014-10-10 17:58:11.577901",
+ "modified": "2015-05-22 02:16:24.614986",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Balance",
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 8ba1b5a..e1d9a8f 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -66,10 +66,21 @@
"oldfieldtype": "Data",
"options": "Email",
"permlevel": 0,
- "reqd": 1
+ "reqd": 0
},
{
- "depends_on": "eval:doc.__islocal",
+ "fieldname": "fold",
+ "fieldtype": "Fold",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "",
"fieldname": "description",
"fieldtype": "Text",
"label": "Description",
@@ -79,28 +90,39 @@
"reqd": 0
},
{
- "fieldname": "fold",
- "fieldtype": "Fold",
+ "fieldname": "column_break_9",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "resolution_date",
+ "fieldtype": "Datetime",
+ "in_filter": 0,
+ "label": "Resolution Date",
+ "no_copy": 1,
+ "oldfieldname": "resolution_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "read_only": 1,
+ "search_index": 0
+ },
+ {
+ "fieldname": "first_responded_on",
+ "fieldtype": "Datetime",
+ "label": "First Responded On",
"permlevel": 0
},
{
"fieldname": "additional_info",
"fieldtype": "Section Break",
- "label": "Reference",
+ "label": "",
"options": "icon-pushpin",
"permlevel": 0,
"read_only": 1
},
{
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 1,
- "width": "50%"
- },
- {
"fieldname": "lead",
"fieldtype": "Link",
"label": "Lead",
@@ -115,6 +137,12 @@
"permlevel": 0
},
{
+ "fieldname": "column_break_16",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "customer",
"fieldtype": "Link",
"in_filter": 1,
@@ -141,6 +169,31 @@
"search_index": 0
},
{
+ "fieldname": "section_break_19",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "resolution_details",
+ "fieldtype": "Small Text",
+ "label": "Resolution Details",
+ "no_copy": 1,
+ "oldfieldname": "resolution_details",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 1
+ },
+ {
"default": "Today",
"fieldname": "opening_date",
"fieldtype": "Date",
@@ -171,54 +224,24 @@
"reqd": 0
},
{
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "first_responded_on",
- "fieldtype": "Datetime",
- "label": "First Responded On",
- "permlevel": 0
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "resolution_date",
- "fieldtype": "Datetime",
- "in_filter": 0,
- "label": "Resolution Date",
- "no_copy": 1,
- "oldfieldname": "resolution_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "read_only": 1,
- "search_index": 0
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "resolution_details",
- "fieldtype": "Small Text",
- "label": "Resolution Details",
- "no_copy": 1,
- "oldfieldname": "resolution_details",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "read_only": 0
- },
- {
"fieldname": "content_type",
"fieldtype": "Data",
"hidden": 1,
"label": "Content Type",
"permlevel": 0
+ },
+ {
+ "fieldname": "attachment",
+ "fieldtype": "Attach",
+ "hidden": 1,
+ "label": "Attachment",
+ "permlevel": 0,
+ "precision": ""
}
],
"icon": "icon-ticket",
"idx": 1,
- "modified": "2015-04-02 22:06:02.684820",
+ "modified": "2015-06-01 08:14:01.750421",
"modified_by": "Administrator",
"module": "Support",
"name": "Issue",
@@ -226,20 +249,6 @@
"permissions": [
{
"amend": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Guest",
- "share": 1,
- "submit": 0,
- "write": 1
- },
- {
- "amend": 0,
"apply_user_permissions": 1,
"create": 1,
"delete": 0,
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 2555bfa..76e5a10 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -17,6 +17,8 @@
return "{0}: {1}".format(_(self.status), self.subject)
def validate(self):
+ if not self.raised_by:
+ self.raised_by = frappe.session.user
self.update_status()
self.set_lead_contact(self.raised_by)
@@ -54,7 +56,8 @@
def get_list_context(context=None):
return {
"title": _("My Issues"),
- "get_list": get_issue_list
+ "get_list": get_issue_list,
+ "row_template": "templates/includes/issue_row.html"
}
def get_issue_list(doctype, txt, filters, limit_start, limit_page_length=20):
@@ -84,3 +87,6 @@
names = json.loads(names)
for name in names:
set_status(name, status)
+
+def has_website_permission(doc, ptype, user, verbose=False):
+ return doc.raised_by==user
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
index 2398950..0ecc9c0 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import add_days, getdate, cint
+from frappe.utils import add_days, getdate, cint, cstr
from frappe import throw, _
from erpnext.utilities.transaction_base import TransactionBase, delete_events
@@ -73,7 +73,7 @@
"owner": email_map[d.sales_person] or self.owner,
"subject": description,
"description": description,
- "starts_on": key["scheduled_date"] + " 10:00:00",
+ "starts_on": cstr(key["scheduled_date"]) + " 10:00:00",
"event_type": "Private",
"ref_type": self.doctype,
"ref_name": self.name
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index e9be40c..caa1366 100644
--- a/erpnext/templates/form_grid/includes/visible_cols.html
+++ b/erpnext/templates/form_grid/includes/visible_cols.html
@@ -1,6 +1,6 @@
{% $.each(visible_columns || [], function(i, df) { %}
{% var val = doc.get_formatted(df.fieldname);
- if((df.fieldname !== "description") && val) { %}
+ if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
<div class="row">
<div class="col-xs-4 text-ellipsis">
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>
@@ -9,5 +9,7 @@
{%= doc.get_formatted(df.fieldname) %}
</div>
</div>
+ {% } else if (df.fieldname==="description") { %}
+ <p>{{ doc.description }}</p>
{% } %}
{% }); %}
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index bc8e23e..197cef4 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -1,4 +1,6 @@
-{% var visible_columns = row.get_visible_columns(["item_code", "item_name", "description", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %}
+{% var visible_columns = row.get_visible_columns(["item_code", "qty", "rate", "amount",
+ "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse",
+ "against_sales_order", "sales_order"]); %}
{% if(!doc) { %}
<div class="row">
@@ -8,6 +10,7 @@
<div class="col-sm-2 col-xs-4 text-right">{%= __("Amount") %}</div>
</div>
{% } else { %}
+ {% var visible_column_fieldnames = $.map(visible_columns, function(x, i) {return x.fieldname}); %}
<div class="row">
<div class="col-sm-6 col-xs-8">
{% if(doc.warehouse) {
@@ -45,8 +48,9 @@
<strong>{%= doc.item_code %}</strong>
{% } %}
- {% if(doc.item_name != doc.item_code) { %}
+ {% if(doc.item_name != doc.item_code && in_list(visible_column_fieldnames, "item_name")) { %}
<br>{%= doc.item_name %}{% } %}
+
{% include "templates/form_grid/includes/visible_cols.html" %}
</div>
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html
index be7fb29..8016316 100644
--- a/erpnext/templates/form_grid/material_request_grid.html
+++ b/erpnext/templates/form_grid/material_request_grid.html
@@ -1,5 +1,5 @@
{% var visible_columns = row.get_visible_columns(["item_code", "warehouse",
- "item_name", "description", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
+ "item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
{% if(!doc) { %}
<div class="row">
diff --git a/erpnext/templates/form_grid/stock_entry_grid.html b/erpnext/templates/form_grid/stock_entry_grid.html
index efb4ab6..1782b82 100644
--- a/erpnext/templates/form_grid/stock_entry_grid.html
+++ b/erpnext/templates/form_grid/stock_entry_grid.html
@@ -1,5 +1,5 @@
{% var visible_columns = row.get_visible_columns(["item_code",
- "item_name", "description", "amount", "stock_uom", "uom", "qty",
+ "item_name", "amount", "stock_uom", "uom", "qty",
"s_warehouse", "t_warehouse", "incoming_rate"]);
%}
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index aa02376..535edcd 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -2,10 +2,13 @@
{% block header %}<h2>{{ title }}</h2>{% endblock %}
+{% block header_actions %}
+{% include 'templates/includes/product_search_box.html' %}
+{% endblock %}
+
{% block content %}
{% from "erpnext/templates/includes/macros.html" import product_image %}
<div class="item-content">
- {% include 'templates/includes/product_search_box.html' %}
<div class="product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
<div class="col-sm-5">
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 348d330..2652f6f 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -1,6 +1,9 @@
+{% block header_actions %}
+{% include 'templates/includes/product_search_box.html' %}
+{% endblock %}
+
{% block content %}
<div class="item-group-content">
- {% include 'templates/includes/product_search_box.html' %}
<div>
{% if slideshow %}<!-- slideshow -->
{% include "templates/includes/slideshow.html" %}
diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html
new file mode 100644
index 0000000..f7eaa76
--- /dev/null
+++ b/erpnext/templates/includes/address_row.html
@@ -0,0 +1,20 @@
+<div class="web-list-item">
+ <a href="/addresses?name={{ doc.name }}" no-pjax>
+ <div class="row">
+ <div class="col-sm-4">
+ <span class="strong">{{ doc.address_title }}</span>
+ </div>
+ <div class="col-sm-2">
+ {{ doc.address_type }}
+ </div>
+ <div class="col-sm-4">
+ {{ doc.address_line1 }}<br>
+ {% if doc.address_line2 %}{{ doc.address_line2 }}<br>{% endif %}
+ {{ doc.city }}<br>
+ </div>
+ <div class="col-sm-2">
+ {% if doc.state %}{{ doc.state }}, {% endif %}{{ doc.country }}
+ </div>
+ </div>
+ </a>
+</div>
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index 4b70173..d5956f9 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -8,7 +8,8 @@
$.extend(shopping_cart, {
show_error: function(title, text) {
- $("#cart-container").html('<div class="msg-box"><h4>' + title + '</h4> ' + text + '</div>');
+ $("#cart-container").html('<div class="msg-box"><h4>' +
+ title + '</h4><p class="text-muted">' + text + '</p></div>');
},
bind_events: function() {
@@ -31,11 +32,11 @@
});
$("#cart-add-shipping-address").on("click", function() {
- window.location.href = "address?address_fieldname=shipping_address_name";
+ window.location.href = "addresses";
});
$("#cart-add-billing-address").on("click", function() {
- window.location.href = "address?address_fieldname=customer_address";
+ window.location.href = "address";
});
$(".btn-place-order").on("click", function() {
@@ -56,7 +57,7 @@
var no_items = $.map(doc.items || [],
function(d) { return d.item_code || null;}).length===0;
if(no_items) {
- shopping_cart.show_error("Empty :-(", frappe._("Go ahead and add something to your cart."));
+ shopping_cart.show_error("Cart Empty", frappe._("Go ahead and add something to your cart."));
$("#cart-addresses").toggle(false);
return;
}
@@ -281,11 +282,11 @@
$(".progress").remove();
if(r.exc) {
if(r.exc.indexOf("WebsitePriceListMissingError")!==-1) {
- shopping_cart.show_error("Oops!", frappe._("Price List not configured."));
+ shopping_cart.show_error("Configuration Error", frappe._("Price List not configured."));
} else if(r["403"]) {
- shopping_cart.show_error("Hey!", frappe._("You need to be logged in to view your cart."));
+ shopping_cart.show_error("Not Allowed", frappe._("You need to be logged in to view your cart."));
} else {
- shopping_cart.show_error("Oops!", frappe._("Something went wrong."));
+ shopping_cart.show_error("Error", frappe._("Something went wrong."));
}
} else {
shopping_cart.set_cart_count();
diff --git a/erpnext/templates/includes/footer/footer_extension.html b/erpnext/templates/includes/footer/footer_extension.html
new file mode 100644
index 0000000..400043e
--- /dev/null
+++ b/erpnext/templates/includes/footer/footer_extension.html
@@ -0,0 +1,42 @@
+{% if not hide_footer_signup %}
+<div class="container">
+ <div class="row">
+ <div class="col-sm-6 col-sm-offset-3 text-center" style="margin-top: 15px;">
+ <input class="form-control" type="text" id="footer-subscribe-email"
+ style="display: inline-block; max-width: 50%; margin-right: 10px;"
+ placeholder="{{ _('Your email address') }}...">
+ <button class="btn btn-default btn-sm" type="button"
+ id="footer-subscribe-button">{{ _("Get Updates") }}</button>
+ </div>
+ </div>
+ <div class="text-center text-muted small" style="padding: 30px;">
+ <a href="https://erpnext.com?source=website_footer" target="_blank" class="text-extra-muted">
+ Powered by ERPNext</a>
+ </div>
+</div>
+<script>
+ $("#footer-subscribe-button").click(function() {
+
+ if($("#footer-subscribe-email").val()) {
+ $("#footer-subscribe-email").attr('disabled', true);
+ $("#footer-subscribe-button").html("Sending...")
+ .attr("disabled", true);
+ erpnext.subscribe_to_newsletter({
+ email: $("#footer-subscribe-email").val(),
+ callback: function(r) {
+ if(!r.exc) {
+ $("#footer-subscribe-button").html(__("Added"))
+ .attr("disabled", true);
+ } else {
+ $("#footer-subscribe-button").html(__("Error: Not a valid id?"))
+ .addClass("btn-danger").attr("disabled", false);
+ $("#footer-subscribe-email").val("").attr('disabled', false);
+ }
+ }
+ });
+ }
+ else
+ frappe.msgprint(frappe._("Please enter email address"))
+ });
+</script>
+{% endif %}
diff --git a/erpnext/templates/includes/footer/footer_powered.html b/erpnext/templates/includes/footer/footer_powered.html
new file mode 100644
index 0000000..c44c342
--- /dev/null
+++ b/erpnext/templates/includes/footer/footer_powered.html
@@ -0,0 +1 @@
+<!-- blank -->
diff --git a/erpnext/templates/includes/footer_extension.html b/erpnext/templates/includes/footer_extension.html
deleted file mode 100644
index e40825d..0000000
--- a/erpnext/templates/includes/footer_extension.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="container">
- <div class="row">
- <div class="col-sm-6 col-sm-offset-3" style="margin-top: 7px;">
- <div class="input-group">
- <input class="form-control" type="text" id="footer-subscribe-email"
- placeholder="{{ _('Your email address') }}...">
- <span class="input-group-btn">
- <button class="btn btn-default" type="button"
- id="footer-subscribe-button">{{ _("Stay Updated") }}</button>
- </span>
- </div>
- </div>
- </div>
-</div>
-<script>
- $("#footer-subscribe-button").click(function() {
-
- if($("#footer-subscribe-email").val()) {
- $("#footer-subscribe-email").attr('disabled', true);
- $("#footer-subscribe-button").html("Sending...")
- .attr("disabled", true);
- erpnext.send_message({
- subject:"Subscribe me",
- sender: $("#footer-subscribe-email").val(),
- message: "Subscribe to newsletter (via website footer).",
- callback: function(r) {
- if(!r.exc) {
- $("#footer-subscribe-button").html("Thank You :)")
- .addClass("btn-success").attr("disabled", true);
- } else {
- $("#footer-subscribe-button").html("Error :( Not a valid id?")
- .addClass("btn-danger").attr("disabled", false);
- $("#footer-subscribe-email").val("").attr('disabled', false);
- }
- }
- });
- }
- else
- frappe.msgprint(frappe._("Please enter email address"))
- });
-</script>
diff --git a/erpnext/templates/includes/footer_powered.html b/erpnext/templates/includes/footer_powered.html
deleted file mode 100644
index 9661181..0000000
--- a/erpnext/templates/includes/footer_powered.html
+++ /dev/null
@@ -1 +0,0 @@
-<a href="http://erpnext.com" style="color: #aaa; font-size: 11px;">ERPNext Powered</a>
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html
new file mode 100644
index 0000000..16a8f7b
--- /dev/null
+++ b/erpnext/templates/includes/issue_row.html
@@ -0,0 +1,21 @@
+<div class="web-list-item">
+ <div class="row">
+ <div class="col-sm-6">
+ <a class="no-decoration" href="/issues?name={{ doc.name }}" no-pjax>
+ {{ doc.subject }}
+ </a>
+ </div>
+ <div class="col-sm-2">
+ <span class="indicator {{ "red" if doc.status=="Open" else "blue" }}">
+ {{ doc.status }}</span>
+ </div>
+ <div class="col-sm-2">
+ <a class="text-muted text-right" href="/issues?name={{ doc.name }}" no-pjax>
+ {{ doc.name }}
+ </a>
+ </div>
+ <div class="col-sm-2 text-muted text-right small">
+ {{ frappe.format_date(doc.creation) }}
+ </div>
+ </div>
+</div>
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index aa44a17..0967e97 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -1,6 +1,6 @@
{% macro product_image_square(website_image, css_class="") %}
<div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
- {% if website_image -%} style="background-image: url({{ website_image }});" {%- endif %}>
+ {% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) }}');" {%- endif %}>
{% if not website_image -%}<i class="centered octicon octicon-device-camera"></i>{%- endif %}
</div>
{% endmacro %}
@@ -8,10 +8,9 @@
{% macro product_image(website_image, css_class="") %}
<div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}">
{% if website_image -%}
- <img src="{{ website_image }}" class="img-responsive">
+ <img src="{{ frappe.utils.quoted(website_image) }}" class="img-responsive">
{%- else -%}
<i class="centered octicon octicon-device-camera"></i>
{%- endif %}
</div>
{% endmacro %}
-
diff --git a/erpnext/templates/includes/product_in_grid.html b/erpnext/templates/includes/product_in_grid.html
index ea49812..d2c1c46 100644
--- a/erpnext/templates/includes/product_in_grid.html
+++ b/erpnext/templates/includes/product_in_grid.html
@@ -1,6 +1,6 @@
{% from "erpnext/templates/includes/macros.html" import product_image_square %}
-<a class="product-link" href="{{ (route or page_name)|with_leading_slash }}">
+<a class="product-link" href="{{ (route or page_name)|abs_url }}">
<div class="col-sm-2 col-xs-4 product-image-wrapper">
{{ product_image_square(website_image) }}
<div class="text-ellipsis inline-block small product-text">{{ item_name }}</div>
diff --git a/erpnext/templates/includes/product_in_list.html b/erpnext/templates/includes/product_in_list.html
index 98e46a7..2a6cbe1 100644
--- a/erpnext/templates/includes/product_in_list.html
+++ b/erpnext/templates/includes/product_in_list.html
@@ -1,15 +1,15 @@
<!-- TODO product listing -->
<div class="container content">
<div style="height: 120px; overflow: hidden;">
- <a href="{{ (route or page_name)|with_leading_slash }}">
+ <a href="{{ (route or page_name)|abs_url }}">
{%- if website_image -%}
- <img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image|with_leading_slash }}">
+ <img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image|abs_url }}">
{%- else -%}
<div style="width: 80%; height: 120px; background-color: #F7FAFC;"></div>
{%- endif -%}
</a>
</div>
<div style="height: 100px; overflow: hidden; font-size: 80%;">
- <div><a href="{{ (route or page_name)|with_leading_slash }}">{{ item_name }}</a></div>
+ <div><a href="{{ (route or page_name)|abs_url }}">{{ item_name }}</a></div>
</div>
</div>
diff --git a/erpnext/templates/includes/product_search_box.html b/erpnext/templates/includes/product_search_box.html
index d4f6e7b..a135396 100644
--- a/erpnext/templates/includes/product_search_box.html
+++ b/erpnext/templates/includes/product_search_box.html
@@ -1,24 +1,21 @@
+<div class="product-search pull-right">
+ <form class="form-inline form-search">
+ <div class="input-group">
+ <input class="form-control" type="text" id="product-search"
+ placeholder="Product Search...">
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="button" id="btn-product-search">
+ <i class="icon-search"></i></button>
+ </span>
+ </div>
+ </form>
+</div>
<script>
frappe.ready(function() {
- $(".product-search").remove();
-
- $('<div class="product-search">\
- <form class="form-inline form-search">\
- <div class="input-group">\
- <input class="form-control" type="text" id="product-search" placeholder="Product Search...">\
- <span class="input-group-btn">\
- <button class="btn btn-default" type="button" id="btn-product-search">\
- <i class="icon-search"></i></button>\
- </span>\
- </div>\
- </form>\
- </div>').appendTo(".page-header-right");
-
- $('.dropdown-toggle').dropdown();
$("#btn-product-search").click(function() {
var txt = $("#product-search").val();
if(txt) {
- window.location.href="product_search?q=" + txt;
+ window.location.href="/product_search?q=" + txt;
}
return false;
});
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index ca03bd3..a677fa5 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -1,5 +1,6 @@
{% set doc = frappe.get_doc(doc) %}
-<a class="website-list-row" href="/{{ pathname }}/{{ doc.name }}" no-pjax>
+<div class="web-list-item">
+<a href="/{{ pathname }}/{{ doc.name }}" no-pjax>
<div class="row">
<div class="col-sm-6 col-xs-7">
<div class="row">
@@ -12,7 +13,7 @@
<span class="indicator orange">{{ doc.status_display }}</span>
{%- endif -%}
{%- elif doc.status -%}
- <span class="indicator">{{ doc.status }}</span>
+ <span class="indicator blue">{{ doc.status }}</span>
{%- endif -%}
</div>
</div>
@@ -27,4 +28,4 @@
{{ frappe.utils.pretty_date(doc.creation) }}</div>
</div>
</a>
-
+</div>
diff --git a/erpnext/templates/pages/address.html b/erpnext/templates/pages/address.html
deleted file mode 100644
index 8544604..0000000
--- a/erpnext/templates/pages/address.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% block title %} {{ title }} {% endblock %}
-
-{% block header %}<h2>{{ title }}</h2>{% endblock %}
-
-{% block content %}
-{% macro render_fields(docfields) -%}
-{% for df in docfields -%}
- {% if df.fieldtype == "Data" -%}
- <fieldset>
- <label>{{ df.label }}</label>
- <input class="form-control" type="text" placeholder="Type {{ df.label }}"
- data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
- {% if doc and doc.get(df.fieldname) -%} value="{{ doc[df.fieldname] }}" {%- endif %}>
- </fieldset>
- {% elif df.fieldtype == "Check" -%}
- <fieldset class="checkbox">
- <label><input type="checkbox" data-fieldname="{{ df.fieldname }}"
- data-fieldtype="{{ df.fieldtype }}"
- {% if doc and frappe.utils.cint(doc.get(df.fieldname)) -%} checked="checked" {%- endif %}>
- {{ df.label }}</label>
- </fieldset>
- {% elif df.fieldtype in ("Select", "Link") -%}
- <fieldset>
- {% set select_options = frappe.get_list(df.options)|map(attribute="name")
- if df.fieldtype == "Link" else df.options.split("\n") %}
- <label>{{ df.label }}</label>
- <select class="form-control" data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}">
- {% for value in select_options -%}
- {% if doc and doc.get(df.fieldname) == value -%}
- <option selected="selected">{{ value }}</option>
- {% else -%}
- <option>{{ value }}</option>
- {%- endif %}
- {%- endfor %}
- </select>
- </fieldset>
- {%- endif %}
-{%- endfor %}
-{%- endmacro %}
-
-<div class="container content">
- <ul class="breadcrumb">
- <li><a href="/index">Home</a></li>
- <li><a href="/addresses">My Addresses</a></li>
- <li class="active"><i class="icon-map-marker icon-fixed-width"></i> {{ title }}</li>
- </ul>
- <h3><i class="icon-map-marker icon-fixed-width"></i> {{ title }}</h3>
- <button type="button" class="btn btn-primary pull-right" id="address-save"><i class="icon-ok"></i>
- {{ doc and "Save" or "Insert" }}</button>
- <div class="clearfix"></div>
- <hr>
- <div id="address-error" class="alert alert-danger" style="display:none"></div>
- <form autocomplete="on">
- <div class="row">
- <section class="col-md-6">
- {{ render_fields(meta.left_fields) }}
- </section>
- <section class="col-md-6">
- {{ render_fields(meta.right_fields) }}
- </section>
- </section>
- </form>
-</div>
-
-<script>
-;(function() {
- console.log("yoyo");
- frappe.ready(function() {
- bind_save();
- });
-
- var bind_save = function() {
- $("#address-save").on("click", function() {
- console.log("clicked!");
-
- var fields = {
- name: "{{ docname or '' }}"
- };
-
- $("form").find("[data-fieldname]").each(function(i, input) {
- var $input = $(input);
- var fieldname = $(input).attr("data-fieldname");
- var fieldtype = $(input).attr("data-fieldtype");
-
- if(fieldtype == "Check") {
- fields[fieldname] = $input.is(":checked") ? 1 : 0;
- } else {
- fields[fieldname] = $input.val();
- }
- });
-
- frappe.call({
- btn: $(this),
- type: "POST",
- method: "erpnext.templates.pages.address.save_address",
- args: { fields: fields, address_fieldname: get_url_arg("address_fieldname") },
- error_msg: "#address-error",
- callback: function(r) {
- if(get_url_arg("address_fieldname")) {
- window.location.href = "cart";
- } else {
- window.location.href = "address?name=" + encodeURIComponent(r.message);
- }
- }
- });
- });
- };
-})();
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}
diff --git a/erpnext/templates/pages/address.py b/erpnext/templates/pages/address.py
deleted file mode 100644
index 20f2798..0000000
--- a/erpnext/templates/pages/address.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import json
-
-import frappe
-from erpnext.shopping_cart.cart import get_lead_or_customer, update_cart_address
-from frappe.desk.form.meta import get_meta
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
- def _get_fields(fieldnames):
- return [frappe._dict(zip(["label", "fieldname", "fieldtype", "options"],
- [df.label, df.fieldname, df.fieldtype, df.options]))
- for df in get_meta("Address").get("fields", {"fieldname": ["in", fieldnames]})]
-
- docname = doc = None
- title = "New Address"
- if frappe.form_dict.name:
- doc = frappe.get_doc("Address", frappe.form_dict.name)
- docname = doc.name
- title = doc.name
-
- return {
- "doc": doc,
- "meta": frappe._dict({
- "left_fields": _get_fields(["address_title", "address_type", "address_line1", "address_line2",
- "city", "state", "pincode", "country"]),
- "right_fields": _get_fields(["email_id", "phone", "fax", "is_primary_address",
- "is_shipping_address"])
- }),
- "docname": docname,
- "title": title
- }
-
-@frappe.whitelist()
-def save_address(fields, address_fieldname=None):
- party = get_lead_or_customer()
- fields = json.loads(fields)
-
- if fields.get("name"):
- doc = frappe.get_doc("Address", fields.get("name"))
- else:
- doc = frappe.get_doc({"doctype": "Address", "__islocal": 1})
-
- doc.update(fields)
-
- party_fieldname = party.doctype.lower()
- doc.update({
- party_fieldname: party.name,
- (party_fieldname + "_name"): party.get(party_fieldname + "_name")
- })
- doc.flags.ignore_permissions = True
- doc.save()
-
- if address_fieldname:
- update_cart_address(address_fieldname, doc.name)
-
- return doc.name
diff --git a/erpnext/templates/pages/addresses.html b/erpnext/templates/pages/addresses.html
deleted file mode 100644
index a0562c6..0000000
--- a/erpnext/templates/pages/addresses.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% block title %} {{ "My Addresses" }} {% endblock %}
-
-{% block header %}<h2>My Addresses</h2>{% endblock %}
-
-{% block breadcrumbs %}{% include "templates/includes/breadcrumbs.html" %}{% endblock %}
-
-{% block content %}
-<div class="addresses-content">
- <p><a class="btn btn-default" href="/address"><i class="icon-plus"> New Address</i></a></p>
- <hr>
- <div id="address-list">
- <div class="text-muted progress">{{ _("Loading") }}...</div>
- </div>
-</div>
-
-<script>
-;(function() {
- var fetch_addresses = function() {
- frappe.call({
- method: "erpnext.templates.pages.addresses.get_addresses",
- callback: function(r) {
- $("#address-list .progress").remove();
- var $list = $("#address-list");
-
- if(!(r.message && r.message.length)) {
- $list.html("<div class='alert'>No Addresses Found</div>");
- return;
- }
-
- $.each(r.message, function(i, address) {
- address.url_name = encodeURIComponent(address.name);
- $(repl('<div> \
- <p><a href="/address?name=%(url_name)s">%(name)s</a></p> \
- <p>%(display)s</p> \
- <hr> \
- </div>', address)).appendTo($list);
- });
- }
- });
- };
-
- $(document).ready(function() {
- fetch_addresses();
- });
-})();
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}
-
diff --git a/erpnext/templates/pages/addresses.py b/erpnext/templates/pages/addresses.py
deleted file mode 100644
index d96ae9b..0000000
--- a/erpnext/templates/pages/addresses.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from erpnext.shopping_cart.cart import get_address_docs
-
-no_cache = 1
-no_sitemap = 1
-
-@frappe.whitelist()
-def get_addresses():
- return get_address_docs()
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index 07e9560..e4e4a6a 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -1,6 +1,6 @@
{% block title %} {{ "Shopping Cart" }} {% endblock %}
-{% block header %}<h2><i class="icon-shopping-cart"></i> Shopping Cart</h2>{% endblock %}
+{% block header %}<h2>{{ _("My Cart") }}</h2>{% endblock %}
{% block script %}{% include "templates/includes/cart.js" %}{% endblock %}
@@ -8,17 +8,18 @@
<div class="cart-content">
<div class="text-muted progress">{{ _("Loading") }}...</div>
<div id="cart-container" class="hide">
- <p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p>
+ <p class="pull-right"><button class="btn btn-success btn-place-order" type="button">
+ {{ _("Place Order") }}</button></p>
<div class="clearfix"></div>
<div id="cart-error" class="alert alert-danger" style="display: none;"></div>
<hr>
<div class="row">
<div class="col-md-9 col-sm-9">
<div class="row">
- <div class="col-md-9 col-md-offset-3"><h4>Item Details</h4></div>
+ <div class="col-md-9 col-md-offset-3"><h4>{{ _("Item Details") }}</h4></div>
</div>
</div>
- <div class="col-md-3 col-sm-3 text-right"><h4>Qty, Amount</h4></div>
+ <div class="col-md-3 col-sm-3 text-right"><h4>{{ _("Qty, Amount") }}</h4></div>
</div><hr>
<div id="cart-items">
</div>
@@ -30,26 +31,26 @@
<div id="cart-addresses">
<div class="row">
<div class="col-md-6">
- <h4>Shipping Address</h4>
+ <h4>{{ _("Shipping Address") }}</h4>
<div id="cart-shipping-address" class="panel-group"
data-fieldname="shipping_address_name"></div>
<button class="btn btn-default" type="button" id="cart-add-shipping-address">
- <span class="icon icon-plus"></span> New Shipping Address</button>
+ <span class="icon icon-list"></span> {{ _("Manage Addresses") }}</button>
</div>
<div class="col-md-6">
<h4>Billing Address</h4>
<div id="cart-billing-address" class="panel-group"
data-fieldname="customer_address"></div>
<button class="btn btn-default" type="button" id="cart-add-billing-address">
- <span class="icon icon-plus"></span> New Billing Address</button>
+ <span class="icon icon-list"></span> {{ _("Manage Addresses") }}</button>
</div>
</div>
<hr>
</div>
- <p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p>
+ <p class="pull-right"><button class="btn btn-success btn-place-order" type="button">
+ {{ _("Place Order") }}</button></p>
</div>
</div>
<!-- no-sidebar -->
{% endblock %}
-
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index 9b51c18..07e6c6e 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -2,6 +2,10 @@
{% block header %}<h2>Product Search</h2>{% endblock %}
+{% block header_actions %}
+{% include 'templates/includes/product_search_box.html' %}
+{% endblock %}
+
{% block content %}
<script>{% include "templates/includes/product_list.js" %}</script>
@@ -15,7 +19,6 @@
});
</script>
-{% include "templates/includes/product_search_box.html" %}
<div class="product-search-content">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">
diff --git a/erpnext/templates/pages/ticket.html b/erpnext/templates/pages/ticket.html
deleted file mode 100644
index 67d4800..0000000
--- a/erpnext/templates/pages/ticket.html
+++ /dev/null
@@ -1,116 +0,0 @@
-{% block title %} {{ title }} {% endblock %}
-
-{% block header %}<h2><i class="icon-ticket icon-fixed-width"></i> {{ title }}</h2>{% endblock %}
-
-{% block content %}
-{% set status_label = {
- "Open": "label-success",
- "To Reply": "label-danger",
- "Closed": "label-default"
-} %}
-
-<div class="ticket-content">
- <ul class="breadcrumb">
- <li><a href="/index">Home</a></li>
- <li><a href="/tickets">My Tickets</a></li>
- <li class="active"><i class="icon-ticket icon-fixed-width"></i> {{ doc.name or "" }}</li>
- </ul>
- {% if not doc -%}
- <script>ask_to_login();</script>
- {% else %}
- <hr>
- {%- if doc.status -%}
- {% if doc.status == "Waiting for Customer" -%}
- {% set status = "To Reply" %}
- {% else %}
- {% set status = doc.status %}
- {%- endif -%}
- <div class="row">
- <div class="col-md-2" style="margin-bottom: 7px;">
- <span class="label {{ status_label.get(status) or 'label-default' }}">{{ status }}</span>
- </div>
- <div class="col-md-8">
- <div class="row col-md-12">{{ doc.subject }}</div>
- </div>
- <div class="col-md-2">
- <span class="text-muted pull-right">{{ frappe.utils.formatdate(doc.creation) }}</span>
- </div>
- </div>
- <div class="row">
- <h4 class="col-xs-6">Messages</h4>
- <div class="col-xs-6">
- <button class="btn btn-sm btn-primary pull-right" id="ticket-reply">
- <i class="icon-envelope icon-fixed-width"></i> Reply</button>
- <button class="btn btn-sm btn-success pull-right hide" id="ticket-reply-send">
- <i class="icon-arrow-right icon-fixed-width"></i> Send</button>
- </div>
- </div>
- <p id="ticket-alert" class="alert alert-danger"
- style="display: none;"> </p>
- <div>
- <table class="table table-bordered table-striped" id="ticket-thread">
- <tbody>
- {%- for comm in
- (doc.get({"doctype":"Communication"})|sort(reverse=True, attribute="creation")) %}
- <tr>
- <td>
- <h5 style="text-transform: none">
- {{ comm.sender }} on {{ frappe.utils.formatdate(comm.creation) }}</h5>
- <hr>
- <p>{{ frappe.utils.is_html(comm.content) and comm.content or
- comm.content.replace("\n", "<br>")}}</p>
- </td>
- </tr>
- {% endfor -%}
- </tbody>
- </table>
- </div>
- {%- endif -%}
- {% endif -%}
-</div>
-
-<script>
-$(document).ready(function() {
- $("#ticket-reply").on("click", function() {
- if(!$("#ticket-reply-editor").length) {
- $('<tr id="ticket-reply-editor"><td>\
- <h5 style="text-transform: none">Reply</h5>\
- <hr>\
- <textarea rows=10 class="form-control" style="resize: vertical;"></textarea>\
- </td></tr>').prependTo($("#ticket-thread").find("tbody"));
- $("#ticket-reply").addClass("hide");
- $("#ticket-reply-send").removeClass("hide");
- }
- });
-
- $("#ticket-reply-send").on("click", function() {
- var reply = $("#ticket-reply-editor").find("textarea").val().trim();
- if(!reply) {
- msgprint("Please write something in reply!");
- } else {
- frappe.call({
- type: "POST",
- method: "erpnext.templates.pages.ticket.add_reply",
- btn: this,
- args: { ticket: "{{ doc.name }}", message: reply },
- callback: function(r) {
- if(r.exc) {
- msgprint(r._server_messages
- ? JSON.parse(r._server_messages).join("<br>")
- : "Something went wrong!");
- } else {
- window.location.reload();
- }
- }
- })
- }
- });
-});
-
-var msgprint = function(txt) {
- if(txt) $("#ticket-alert").html(txt).toggle(true);
-}
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}
diff --git a/erpnext/templates/pages/ticket.py b/erpnext/templates/pages/ticket.py
deleted file mode 100644
index 811f4fb..0000000
--- a/erpnext/templates/pages/ticket.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import today
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
- doc = frappe.get_doc("Issue", frappe.form_dict.name)
- if doc.raised_by == frappe.session.user:
- ticket_context = {
- "title": doc.name,
- "doc": doc
- }
- else:
- ticket_context = {"title": "Not Allowed", "doc": {}}
-
- return ticket_context
-
-@frappe.whitelist()
-def add_reply(ticket, message):
- if not message:
- raise frappe.throw(_("Please write something"))
-
- doc = frappe.get_doc("Issue", ticket)
- if doc.raised_by != frappe.session.user:
- raise frappe.throw(_("You are not allowed to reply to this ticket."), frappe.PermissionError)
-
- comm = frappe.get_doc({
- "doctype":"Communication",
- "subject": doc.subject,
- "content": message,
- "sender": doc.raised_by,
- "sent_or_received": "Received"
- })
- comm.insert(ignore_permissions=True)
-
diff --git a/erpnext/templates/pages/tickets.html b/erpnext/templates/pages/tickets.html
deleted file mode 100644
index 40cd80e..0000000
--- a/erpnext/templates/pages/tickets.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{% block title %} {{ title }} {% endblock %}
-
-{% block header %}<h2>{{ title }}</h2>{% endblock %}
-
-{% block content %}
-{% include "templates/includes/transactions.html" %}
-
-<script>
- var status_label = {
- "Open": "label-success",
- "Waiting for Customer": "label-danger",
- "Closed": "label-default"
- }
-
- var render = function(doc) {
- doc.status = doc.status.trim();
- doc.label_class = status_label[doc.status] || "label-default";
- if(doc.status==="Waiting for Customer") doc.status = "To Reply";
-
- $(repl('<a href="{{ page }}?name=%(name)s" class="list-group-item">\
- <div class="row">\
- <div class="col-md-2" style="margin-bottom: 7px;"><span class="label %(label_class)s">\
- %(status)s</span></div>\
- <div class="col-md-8">\
- <div class="row col-md-12">%(name)s</div>\
- <div class="row col-md-12 text-muted">%(subject)s</div>\
- </div>\
- <div class="col-md-2 pull-right">\
- <span class="text-muted">%(creation)s</span>\
- </div>\
- </div>\
- </a>', doc)).appendTo($list);
- };
-
- frappe.ready(function() {
- if(!window.$new_ticket) {
- window.$new_ticket = $('<div>\
- <button class="btn btn-primary" style="margin-bottom: 15px;" id="new-ticket">\
- <i class="icon-tag icon-fixed-width"></i> New Ticket\
- </button>\
- <button class="btn btn-success hide" style="margin-bottom: 15px;" id="new-ticket-send">\
- <i class="icon-arrow-right icon-fixed-width"></i> Send\
- </button>\
- </div>').insertBefore(".transaction-list");
- }
-
- window.$new_ticket.find("#new-ticket").on("click", function() {
- $(this).addClass("hide");
- $(window.$new_ticket).find("#new-ticket-send").removeClass("hide");
- $('<div class="well" id="ticket-editor">\
- <div class="form-group"><input class="form-control" type="data"\
- placeholder="Subject" data-fieldname="subject"></div>\
- <div class="form-group"><textarea rows=10 class="form-control" \
- style="resize: vertical;" placeholder="Message" \
- data-fieldname="message"></textarea></div>\
- </div>')
- .insertAfter(window.$new_ticket);
- });
-
- window.$new_ticket.find("#new-ticket-send").on("click", function() {
- var subject = $("#ticket-editor").find('[data-fieldname="subject"]').val().trim();
- var message = $("#ticket-editor").find('[data-fieldname="message"]').val().trim();
- if(!(subject && message)) {
- msgprint("Please write something in subject and message!");
- } else {
- frappe.call({
- type: "POST",
- method: "erpnext.templates.pages.tickets.make_new_ticket",
- btn: this,
- args: { subject: subject, message: message },
- callback: function(r) {
- if(r.exc) {
- msgprint(r._server_messages
- ? JSON.parse(r._server_messages).join("<br>")
- : "Something went wrong!");
- } else {
- window.location.href = "ticket?name=" + encodeURIComponent(r.message);
- }
- }
- })
- }
- });
- });
-
- var msgprint = function(txt) {
- if(txt) $("#msgprint-alert").html(txt).toggle(true);
- }
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}
-
diff --git a/erpnext/templates/pages/tickets.py b/erpnext/templates/pages/tickets.py
deleted file mode 100644
index 393c020..0000000
--- a/erpnext/templates/pages/tickets.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cint, formatdate
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
- return {
- "title": "My Tickets",
- "method": "erpnext.templates.pages.tickets.get_tickets",
- "icon": "icon-ticket",
- "empty_list_message": "No Tickets Raised",
- "page": "ticket"
- }
-
-@frappe.whitelist()
-def get_tickets(start=0):
- tickets = frappe.db.sql("""select name, subject, status, creation
- from `tabIssue` where raised_by=%s
- order by modified desc
- limit %s, 20""", (frappe.session.user, cint(start)), as_dict=True)
- for t in tickets:
- t.creation = formatdate(t.creation)
-
- return tickets
-
-@frappe.whitelist()
-def make_new_ticket(subject, message):
- if not (subject and message):
- raise frappe.throw(_("Please write something in subject and message!"))
-
- ticket = frappe.get_doc({
- "doctype":"Issue",
- "subject": subject,
- "raised_by": frappe.session.user,
- })
- ticket.insert(ignore_permissions=True)
-
- comm = frappe.get_doc({
- "doctype":"Communication",
- "subject": subject,
- "content": message,
- "sender": frappe.session.user,
- "sent_or_received": "Received",
- "reference_doctype": "Issue",
- "reference_name": ticket.name
- })
- comm.insert(ignore_permissions=True)
-
- return ticket.name
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
index f4c3d2c..116523c 100644
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -1,19 +1,25 @@
{% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
-<div class="pull-left" style="max-width: 20%; margin-right: 10px;">
- <img src="{{ doc.image }}" style="max-width: 100%">
+<div class="pull-left" style="max-width: 38.2%; margin-right: 10px;">
+ <img src="{{ doc.image }}" class="img-responsive">
</div>
{%- endif %}
<div>
- {% if doc.in_format_data("item_code") -%}
+ {% if doc.in_format_data("item_code") and not doc.is_print_hide("item_code") -%}
<div class="primary">{{ doc.item_code }}</div>
{%- endif %}
- {% if (doc.in_format_data("item_name") and
- (not doc.in_format_data("item_code") or doc.item_code != doc.item_name)) -%}
+ {% if (doc.in_format_data("item_name") and not doc.is_print_hide("item_name") and
+ (not doc.in_format_data("item_code") or doc.is_print_hide("item_code")
+ or doc.item_code != doc.item_name)) -%}
<div class="primary">{{ doc.get_formatted("item_name") }}</div>
{%- endif %}
{% if (doc.in_format_data("description") and doc.description and
- ((not doc.in_format_data("item_code") and not doc.in_format_data("item_name"))
- or not (doc.item_code == doc.item_name == doc.description))) -%}
+ (
+ (
+ (not doc.in_format_data("item_code") or doc.is_print_hide("item_code")) and
+ (not doc.in_format_data("item_name") or doc.is_print_hide("item_name"))
+ ) or not (doc.item_code == doc.item_name == doc.description)
+ ))
+ -%}
<p>{{ doc.get_formatted("description") }}</p>
{%- endif %}
</div>
diff --git a/erpnext/tests/test_client.py b/erpnext/tests/test_client.py
new file mode 100644
index 0000000..153ce75
--- /dev/null
+++ b/erpnext/tests/test_client.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
+
+import unittest, frappe
+from frappe.utils import sel
+from frappe.utils import formatdate
+
+selenium_tests = True
+
+# class TestLogin(unittest.TestCase):
+# def setUp(self):
+# sel.login()
+#
+# def test_material_request(self):
+# sel.new_doc("Stock", "Material Request")
+# sel.set_field("company", "_Test Company")
+# sel.add_child("items")
+# sel.set_field("item_code", "_Test Item")
+# sel.set_field("qty", "1")
+# sel.set_field("warehouse", "_Test Warehouse - _TC")
+# sel.set_field("schedule_date", formatdate())
+# sel.done_add_child("items")
+# sel.primary_action()
+# sel.wait_for_state("clean")
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 2a042e1..846f5ce 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -22,7 +22,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Compaction plus sintering,الضغط بالإضافة إلى تلبد
DocType: Sales BOM,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""",العنصر الذي يمثل الحزمة. يجب أن يكون لدى هذا البند "هو المخزون السلعة" ب "لا" و "هل المبيعات السلعة" ب "نعم"
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,وسيتم احتساب * في المعاملة.
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,يرجى إدخال رقم الموظف من هذا بارسون المبيعات
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},الرجاء تعيين مفاتيح الوصول محرك جوجل في {0}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,من المواد طلب
@@ -30,18 +30,18 @@
DocType: Job Applicant,Job Applicant,طالب العمل
apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,قانوني
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},لا يمكن تضمين ضريبة نوع الفعلية في سعر البند في الصف {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},لا يمكن تضمين ضريبة نوع الفعلية في سعر الصنف في الصف {0}
DocType: C-Form,Customer,زبون
DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
DocType: Department,Department,قسم
-DocType: Purchase Order,% Billed,% أصدر من قيمة الفاتورة
+DocType: Purchase Order,% Billed,% فوترت
DocType: Selling Settings,Customer Name,اسم العميل
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.",هي المجالات ذات الصلة عن تصدير مثل العملة ، ومعدل التحويل ، ومجموع التصدير، تصدير الخ المجموع الكلي المتاحة في توصيل ملاحظة ، ونقاط البيع ، اقتباس، فاتورة المبيعات ، ترتيب المبيعات الخ
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 +143,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
DocType: Leave Type,Leave Type Name,ترك اسم نوع
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,سلسلة التحديث بنجاح
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Stitching,درز
DocType: Pricing Rule,Apply On,تنطبق على
DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
@@ -77,7 +77,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,النجارة
DocType: Production Order Operation,Work In Progress,التقدم في العمل
DocType: Company,If Monthly Budget Exceeded,إذا تجاوز الميزانية الشهرية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,3D الطباعة
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,طباعة ثلاثية الأبعاد
DocType: Employee,Holiday List,عطلة قائمة
DocType: Time Log,Time Log,وقت دخول
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,محاسب
@@ -120,7 +120,7 @@
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,الوالد البند {0} لا يجب أن يكون البند الأسهم و يجب أن يكون تاريخ المبيعات
DocType: Item,Item Image (if not slideshow),صورة البند (إن لم يكن عرض الشرائح)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,موجود على العملاء مع نفس الاسم
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ساعة السعر / 60) * الفعلي وقت التشغيل
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
DocType: SMS Log,SMS Log,SMS دخول
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
DocType: Blog Post,Guest,ضيف
@@ -164,7 +164,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,عرض الوقت سجلات
DocType: Email Digest,Bank/Cash Balance,بنك / النقد وما في حكمه
DocType: Delivery Note,Installation Status,تثبيت الحالة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},يجب أن يكون مقبول مرفوض + الكمية مساوية ل كمية تلقى القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,البند {0} يجب أن يكون شراء السلعة
DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -218,14 +218,14 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Gashing,Gashing
DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} does not belong to Company {1},حساب {0} لا ينتمي إلى شركة {1}
-DocType: Naming Series,Series List for this Transaction,قائمة سلسلة لهذه الصفقة
+DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},مستودع محفوظة الأسهم المطلوبة لل تفاصيل {0} في {1} الصف
DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
DocType: Supplier,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,ل مطلوب في معرض النماذج ثلاثية قبل إرسال
DocType: Sales Partner,Reseller,بائع التجزئة
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,يرجى إدخال الشركة
-DocType: Delivery Note Item,Against Sales Invoice Item,ضد فاتورة المبيعات البند
+DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات
,Production Orders in Progress,أوامر الإنتاج في التقدم
DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,لصناعة السيارات في رفع طلب مادة إذا يذهب كمية أقل من مستوى إعادة ترتيب في مستودع الافتراضي
DocType: Journal Entry,Write Off Amount <=,شطب المبلغ <=
@@ -321,7 +321,7 @@
DocType: Communication,Support Manager,مدير الدعم
DocType: Sales Order Item,Reserved Warehouse,مستودع محفوظة
apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة المدينة
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
DocType: Workstation,Rent Cost,الإيجار التكلفة
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,الرجاء اختيار الشهر والسنة
DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",أدخل البريد الإلكتروني معرف مفصولة بفواصل، سوف ترسل الفاتورة تلقائيا على تاريخ معين
@@ -345,14 +345,14 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تحويل لغير المجموعه
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,يجب تقديم شراء إيصال
DocType: Stock UOM Replace Utility,Current Stock UOM,الأسهم الحالية UOM
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,دفعة (الكثير) من عنصر.
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,رقم المجموعة للصنف
DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
-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'","كما أن هناك معاملات المخزون الحالي لهذا البند، لا يمكنك تغيير قيم ""ليس لديه المسلسل '،' لديه دفعة لا '،' هل البند الأسهم"" و ""أسلوب التقييم"""
+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'","يوجد سجل معاملات المخزون لهذا الصنف، لا يمكنك تغيير قيم ""لديه رقم متسلسل '،' لديه رقم تجميع '،' من صنف المخزون"" و "" طريقة الجرد"""
apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,عنوان البريد الإلكتروني الخاص بك
DocType: Email Digest,Income booked for the digest period,حجزت الدخل للفترة هضم
apps/erpnext/erpnext/config/setup.py +106,Supplier master.,المورد الرئيسي.
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,يرجى الاطلاع على المرفقات
-DocType: Purchase Order,% Received,حصل على٪
+DocType: Purchase Order,% Received,تم استلام٪
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,قطع المياه النفاثة
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,الإعداد الكامل بالفعل !
,Finished Goods,السلع تامة الصنع
@@ -381,7 +381,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,الرجاء إدخال شراء الإيصال لا على المضي قدما
DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) يجب أن يكون دور ""إجازة الموافق"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات)
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,طبي
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,السبب لفقدان
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,أنبوب الديكور
@@ -396,14 +396,14 @@
DocType: Purchase Order,Start date of current order's period,تاريخ الفترة الحالية أجل نبدأ
apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},لا يمكن أن يكون كمية جزء في الصف {0}
DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
-DocType: Delivery Note,% Installed,٪ المثبتة
+DocType: Delivery Note,% Installed,٪ تم تثبيت
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,الرجاء إدخال اسم الشركة الأولى
DocType: BOM,Item Desription,البند Desription
DocType: Buying Settings,Supplier Name,اسم المورد
DocType: Account,Is Group,غير المجموعة
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,بالحرارة
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,الحز
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','بالقضية رقم' لا يمكن أن يكون أقل من 'من القضية رقم'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','الى الحالة رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,غير الربح
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,لم تبدأ
DocType: Lead,Channel Partner,قناة الشريك
@@ -485,7 +485,7 @@
عنوان البريد الإلكتروني"""
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,مجموع الفواتير هذه السنة:
DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
-DocType: Purchase Invoice,Supplier Invoice No,المورد الفاتورة لا
+DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
DocType: Territory,For reference,للرجوع إليها
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),إغلاق (الكروم)
DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
@@ -565,7 +565,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,من إيصال الشراء
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
DocType: SMS Settings,Receiver Parameter,استقبال معلمة
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" المجموعة بواسطة ' لا يمكن أن يكون نفس"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
DocType: Sales Person,Sales Person Targets,أهداف المبيعات شخص
sites/assets/js/form.min.js +253,To,إلى
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,يرجى إدخال عنوان البريد الإلكتروني
@@ -636,7 +636,7 @@
DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
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 +108,{0} is not a stock Item,{0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} ليس من نوع المخزون
DocType: Mode of Payment Account,Default Account,الافتراضي حساب
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
DocType: Contact Us Settings,Address Title,عنوان عنوان
@@ -746,14 +746,14 @@
apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,دعم الاستفسارات من العملاء.
DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
DocType: Production Planning Tool,Select Items,حدد العناصر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} ضد بيل {1} بتاريخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
DocType: Communication,Reference Name,مرجع اسم
DocType: Maintenance Visit,Completion 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",لتتبع اسم العلامة التجارية في الوثائق التالية توصيل ملاحظة ، فرصة ، طلب المواد ، البند ، طلب شراء ، شراء قسيمة ، المشتري الإيصال، اقتباس، فاتورة المبيعات ، مبيعات BOM ، ترتيب المبيعات ، رقم المسلسل
DocType: Production Order,Target Warehouse,الهدف مستودع
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع المجموعات تفاصيل
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
DocType: Salary Manager,Activity Log,سجل النشاط
apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,صافي الربح / الخسارة
apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
@@ -794,7 +794,7 @@
DocType: HR Settings,Include holidays in Total no. of Working Days,تشمل أيام العطل في المجموع لا. أيام العمل
DocType: Job Applicant,Hold,عقد
DocType: Employee,Date of Joining,تاريخ الانضمام
-DocType: Naming Series,Update Series,تحديث سلسلة
+DocType: Naming Series,Update Series,تحديث الرقم المتسلسل
DocType: Supplier Quotation,Is Subcontracted,وتعاقد من الباطن
DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,رأي المشتركين
@@ -833,7 +833,7 @@
DocType: Employee,Permanent Address Is,العنوان الدائم هو
DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,العلامة التجارية
-apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,بدل لأكثر من {0} عبرت القطعة ل{1}.
+apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
DocType: Item,Is Purchase Item,هو شراء مادة
DocType: Payment Reconciliation Payment,Purchase Invoice,فاتورة شراء
@@ -857,7 +857,7 @@
DocType: Pricing Rule,Max Qty,ماكس الكمية
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,مادة كيميائية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,وقد تم بالفعل نقل جميع العناصر لهذا أمر الإنتاج.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
DocType: Salary Manager,Select Payroll Year and Month,حدد الرواتب السنة والشهر
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""",انتقل إلى المجموعة المناسبة (عادة طلب تمويل> الأصول الحالية> الحسابات المصرفية وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع "البنك"
DocType: Workstation,Electricity Cost,تكلفة الكهرباء
@@ -874,7 +874,7 @@
DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
DocType: Workflow State,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.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
-DocType: Purchase Order,% of materials billed against this Purchase Order.,٪ من المواد توصف ضد هذا أمر الشراء.
+DocType: Purchase Order,% of materials billed against this Purchase Order.,٪ من المواد فوترت مقابل أمر الشراء هذا.
apps/erpnext/erpnext/controllers/selling_controller.py +155,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 +34,Opening Qty,فتح الكمية
@@ -914,7 +914,7 @@
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 Sales BOM Item.
-Note: BOM = Bill of Materials","مجموعة مجمعة من عناصر ** ** في البند ** ** آخر. وهذا مفيد إذا كنت تجميع لبعض الأصناف ** ** في حزمة ويمكنك الحفاظ على المخزون من الأصناف ** معبأة ** وليس مجموع المباراتين ** ** البند.
+Note: BOM = Bill of Materials","مجموعة مجمعة من ** ** الأصناف ** ** في ** صنف ** آخر. وهذا مفيد إذا كنت تريد تجميع بعض ** الأصناف ** في حزمة ويمكنك الحفاظ على المخزون من الأصناف ** معبأة ** وليس مجموع المباراتين ** ** البند.
حزمة ** ** البند سيكون لها ""هل البند الأسهم"" ب ""لا"" و ""هل المبيعات البند"" ب ""نعم"".
@@ -931,7 +931,7 @@
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,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
DocType: Serial No,Creation Document No,إنشاء وثيقة لا
DocType: Issue,Issue,قضية
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",سمات المتغيرات البند. على سبيل المثال الحجم واللون الخ
+apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +30,WIP Warehouse,مستودع WIP
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
DocType: BOM Operation,Operation,عملية
@@ -967,13 +967,13 @@
DocType: Contact,Enter designation of this Contact,أدخل تسمية هذا الاتصال
DocType: Contact Us Settings,Address,عنوان
DocType: Expense Claim,From Employee,من موظف
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} ليس في أي سنة مالية. لمزيد من التفاصيل الاختيار {2}.
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} ليس في أي سنة مالية. لمزيد من التفاصيل اضطلع على {2}.
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
DocType: Appraisal Template Goal,Key Performance Area,مفتاح الأداء المنطقة
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,نقل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} يجب أن تقدم
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} يجب أن يؤكّد
DocType: SMS Center,Total Characters,مجموع أحرف
apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
DocType: C-Form Invoice Detail,C-Form Invoice Detail, تفاصيل الفاتورة نموذج - س
@@ -1000,7 +1000,7 @@
DocType: Salary Slip,Earnings,أرباح
DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,شيء أن تطلب
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون أكبر من "" تاريخ الانتهاء الفعلي """
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,إدارة
apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,أنواع الأنشطة لجداول زمنية
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,الاستثمار الصب
@@ -1011,7 +1011,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,أزرق
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,العقد الإضافية التي يمكن أن تنشأ إلا في ظل العقد نوع ' المجموعة '
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} غ المسلسل صالحة لل تفاصيل {1}
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} أرقام متسلسلة صالحة للصنف {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز المدينة لل رقم التسلسلي
DocType: Purchase Order Item,UOM Conversion Factor,UOM تحويل عامل
DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
@@ -1040,7 +1040,7 @@
DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
DocType: Lead,Call,دعوة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,' مقالات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},صف مكررة {0} مع نفسه {1}
,Trial Balance,ميزان المراجعة
sites/assets/js/erpnext.min.js +2,"Grid ""","الشبكة """
@@ -1052,7 +1052,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,عرض ليدجر
DocType: Cost Center,Lft,LFT
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-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",وجود فريق المدينة مع نفس الاسم، الرجاء تغيير اسم العنصر أو إعادة تسمية المجموعة البند
+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",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
DocType: Sales Order,Delivery Status,حالة التسليم
DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,بقية العالم
@@ -1088,7 +1088,7 @@
DocType: Email Digest,New Stock Entries,مقالات جديدة للأسهم
apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,صغير
-DocType: Employee,Employee Number,عدد الموظفين
+DocType: Employee,Employee Number,رقم الموظف
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
DocType: Material Request,% Completed,٪ مكتمل
,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
@@ -1139,7 +1139,7 @@
DocType: Journal Entry,Journal Entry,إدخال دفتر اليومية
DocType: Workstation,Workstation Name,اسم محطة العمل
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,أرسل دايجست:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى البند {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
DocType: Sales Partner,Target Distribution,هدف التوزيع
sites/assets/js/desk.min.js +536,Comments,تعليقات
DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
@@ -1379,18 +1379,18 @@
DocType: Party Type,Contacts,اتصالات
apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,الإعداد كاملة
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0} وصفت٪
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0} فوترت٪
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,الكمية المحجوزة
DocType: Party Account,Party Account,حساب طرف
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,الموارد البشرية
DocType: Lead,Upper Income,العلوي الدخل
apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,قضايا بلدي
-DocType: BOM Item,BOM Item,BOM المدينة
+DocType: BOM Item,BOM Item,BOM صنف
DocType: Appraisal,For Employee,لموظف
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,صف {0} كمية الدفع لا يمكن أن يكون سلبيا
DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,الصحافة المناسب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},ضد فاتورة المورد {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
DocType: Party Type,Default Price List,قائمة الأسعار الافتراضي
DocType: Journal Entry,User Remark will be added to Auto Remark,ملاحظة سيتم إضافة مستخدم لملاحظة السيارات
DocType: Payment Reconciliation,Payments,المدفوعات
@@ -1469,7 +1469,7 @@
DocType: DocPerm,Delete,حذف
apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,مختلف
sites/assets/js/desk.min.js +836,New {0},جديد {0}
-DocType: Naming Series,Set prefix for numbering series on your transactions,تعيين بادئة لترقيم السلسلة على المعاملات الخاصة بك
+DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
DocType: Employee,Leave Encashed?,ترك صرفها؟
@@ -1509,7 +1509,7 @@
DocType: Pricing Rule,Brand,علامة تجارية
DocType: Item,Will also apply for variants,سوف تنطبق أيضا على متغيرات
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,سلمت ٪
-apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,حزمة البنود في وقت البيع.
+apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
DocType: Sales Order Item,Actual Qty,الكمية الفعلية
DocType: Quality Inspection Reading,Reading 10,قراءة 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.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
@@ -1575,7 +1575,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,نقر
DocType: Naming Series,Current Value,القيمة الحالية
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},قالب البند لا يمكن أن يكون الأسهم وvaraiants. الرجاء إزالة الأوراق المالية من مستودعات {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} خلق
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} تم إنشاء
DocType: Journal Entry Account,Against Sales Order,ضد ترتيب المبيعات
,Serial No Status,المسلسل لا الحالة
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
@@ -1628,7 +1628,7 @@
DocType: Communication,Date,تاريخ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,كرر الإيرادات العملاء
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.,"الرجاء الانتظار حتى يتم الانتهاء من اعداد النظام, قد يستغرق بضع دقائق."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) يجب أن يكون دور ""النفقات الموافق"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (إعتماد النفقات)
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,زوج
DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
@@ -1640,12 +1640,12 @@
,Quotation Trends,اتجاهات الاقتباس
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",كما يمكن أن يتم ترتيب الإنتاج لهذا البند، يجب أن يكون بند الأوراق المالية .
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",لأنه يمكن أن يتم اصدار أمر إنتاج لهذا الصنف، يجب أن يكون الصنف من نوع المخزون .
DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,انضمام
DocType: Authorization Rule,Above Value,فوق القيمة
,Pending Amount,في انتظار المبلغ
-DocType: Purchase Invoice Item,Conversion Factor,تحويل عامل
+DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
DocType: Serial No,Delivered,تسليم
apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),إعداد ملقم واردة عن وظائف البريد الإلكتروني معرف . (على سبيل المثال jobs@example.com )
DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
@@ -1659,7 +1659,7 @@
apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,شجرة حسابات finanial .
DocType: Leave Control Panel,Leave blank if considered for all employee types,ترك فارغا إذا نظرت لجميع أنواع موظف
DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على
-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,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة ""كما البند {1} هو البند الأصول"
+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,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة "" لأن الصنف {1} من ضمن الأصول"
DocType: HR Settings,HR Settings,إعدادات HR
apps/frappe/frappe/config/setup.py +130,Printing,طبع
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
@@ -1678,7 +1678,7 @@
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,السنة المالية تنتهي في الخاص
DocType: POS Setting,Price List,قائمة الأسعار
-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} الآن الافتراضي السنة المالية. يرجى تحديث المتصفح ل التغيير نافذ المفعول .
+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} الآن سنة مالية افتنراضية، يرجى تحديث المتصفح ل التغيير نافذ المفعول .
apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,مطالبات حساب
DocType: Email Digest,Support,دعم
DocType: Authorization Rule,Approving Role,الموافقة على دور
@@ -1692,7 +1692,7 @@
DocType: Salary Slip,Deduction,اقتطاع
DocType: Address Template,Address Template,قالب عنوان
DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
-DocType: Project,% Tasks Completed,مهام٪ انهوا
+DocType: Project,% Tasks Completed,مهام٪ تم انهاء
DocType: Project,Gross Margin,هامش الربح الإجمالي
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,المستخدم معطل
@@ -1705,7 +1705,7 @@
DocType: Employee,Date of Birth,تاريخ الميلاد
DocType: Salary Manager,Salary Manager,راتب المدير
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,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: 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: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
@@ -1715,7 +1715,7 @@
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +34,Please select a valid csv file with data,يرجى تحديد ملف CSV صالحة مع البيانات
DocType: Features Setup,To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,لتعقب العناصر في المبيعات وثائق الشراء مع NOS دفعة <br> <b>الصناعة المفضل: الكيمياء الخ</b>
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Coating,طلية
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية سلسلة"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"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.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار.
DocType: Expense Claim,Approver,الموافق
,SO Qty,SO الكمية
@@ -1738,14 +1738,14 @@
apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة الأسهم الإجمالية
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",لا يمكن overbill ل{0} البند في الصف {1} أكثر من {2}. للسماح بالمغالاة في الفواتير، يرجى ضبط إعدادات في الأوراق المالية
DocType: Employee,Bank Name,اسم البنك
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-أعلى
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,المستخدم {0} تم تعطيل
DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,حدد الشركة ...
DocType: Leave Control Panel,Leave blank if considered for all departments,اتركه فارغا إذا نظرت لجميع الإدارات
apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",أنواع العمل (دائمة أو عقد الخ متدربة ) .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} إلزامي القطعة ل {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
DocType: Currency Exchange,From Currency,من العملات
DocType: DocField,Name,اسم
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
@@ -1770,7 +1770,7 @@
DocType: Quality Inspection,In Process,في عملية
DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
DocType: Purchase Receipt,Detailed Breakup of the totals,مفصلة تفكك مجاميع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} ضد ترتيب المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
DocType: Account,Fixed Asset,الأصول الثابتة
DocType: Time Log Batch,Total Billing Amount,المبلغ الكلي الفواتير
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب المستحق
@@ -1830,7 +1830,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,لحام
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,مطلوب اسهم جديدة UOM
DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,وقد تم بالفعل فواتير جميع البنود
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح 'من القضية رقم'
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,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
DocType: Project,External,خارجي
@@ -1907,10 +1907,10 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,التلميع
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),مصدر الأموال ( المطلوبات )
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
-DocType: Appraisal,Employee,عامل
+DocType: Appraisal,Employee,موظف
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,استيراد البريد الإلكتروني من
DocType: Features Setup,After Sale Installations,بعد التثبيت بيع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} وتوصف بشكل كامل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
DocType: Workstation Working Hour,End Time,نهاية الوقت
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية ل مبيعات أو شراء .
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,المجموعة بواسطة قسيمة
@@ -1937,7 +1937,7 @@
DocType: Quality Inspection Reading,Reading 9,قراءة 9
DocType: Buying Settings,Buying Settings,إعدادات الشراء
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,التشطيب الشامل
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM رقم السلعة جيدة للتشطيب
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,رقم BOM للأصناف المنتجة
DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
apps/erpnext/erpnext/config/selling.py +153,Setup incoming server for sales email id. (e.g. sales@example.com),إعداد ملقم البريد الإلكتروني الوارد لل مبيعات الهوية. (على سبيل المثال sales@example.com )
DocType: Warranty Claim,Raised By,التي أثارها
@@ -1952,7 +1952,7 @@
DocType: Print Settings,Modern,حديث
DocType: Communication,Replied,رد
DocType: Payment Tool,Total Payment Amount,المبلغ الكلي للدفع
-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}) لا يمكن أن يكون أكبر من quanitity والمخططة ({2}) في أمر الإنتاج {3}
+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}) لا يمكن أن تتخطي الكمية المخططة {2} في أمر الانتاج {3}
DocType: Shipping Rule,Shipping Rule Label,الشحن تسمية القاعدة
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
DocType: Newsletter,Test,اختبار
@@ -1960,7 +1960,7 @@
DocType: Employee,Previous Work Experience,خبرة العمل السابقة
DocType: Stock Entry,For Quantity,لالكمية
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} لا تقدم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,طلبات البنود.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
DocType: Email Digest,New Communications,جديد الاتصالات
@@ -2002,7 +2002,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / تاجر / عمولة الوكيل / التابعة / التجزئة الذي يبيع منتجات شركة من أجل عمولة.
DocType: Customer Group,Has Child Node,وعقدة الطفل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} ضد طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",أدخل المعلمات URL ثابت هنا (مثلا المرسل = ERPNext، اسم المستخدم = ERPNext، كلمة المرور = 1234 الخ)
apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,شيخوخة المدى 1
@@ -2084,7 +2084,7 @@
DocType: Purchase Invoice,Will be calculated automatically when you enter the details,وسيتم احتساب تلقائيا عند إدخال تفاصيل
DocType: Delivery Note,Transporter lorry number,نقل الشاحنة رقم
DocType: Sales Order,Billing Status,الحالة الفواتير
-DocType: Backup Manager,Backup Right Now,النسخ الاحتياطي الحق الآن
+DocType: Backup Manager,Backup Right Now,خذ نسخة احتياطية الان
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,مصاريف فائدة
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90 وفوق
DocType: Buying Settings,Default Buying Price List,الافتراضي شراء قائمة الأسعار
@@ -2394,7 +2394,7 @@
DocType: Pricing Rule,Purchase Manager,مدير المشتريات
DocType: Payment Tool,Payment Tool,دفع أداة
DocType: Target Detail,Target Detail,الهدف التفاصيل
-DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد توصف ضد هذا أمر المبيعات
+DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد فوترت مقابل أمر المبيعات
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,بدء فترة الإغلاق
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
@@ -2406,7 +2406,7 @@
apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
DocType: GL Entry,Voucher No,رقم السند
DocType: Leave Allocation,Leave Allocation,ترك توزيع
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,""" الأسهم تحديث ' ل فاتورة المبيعات {0} يجب تعيين"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,""" تحديث المخزون' ل فاتورة المبيعات {0} يجب إدخاله"
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,طلبات المواد {0} خلق
apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,قالب من الشروط أو العقد.
DocType: Employee,Feedback,تعليقات
@@ -2464,7 +2464,7 @@
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,مساعدة سريعة
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
DocType: Features Setup,Sales Extras,مبيعات إضافات
-apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} ضد مركز التكلفة {2} سيتجاوز التي كتبها {3}
+apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
DocType: Leave Allocation,Carry Forwarded Leaves,تحمل أوراق واحال
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
@@ -2477,14 +2477,14 @@
DocType: Backup Manager,Upload Backups to Dropbox,تحميل النسخ الاحتياطي إلى دروببوإكس
,Qty to Receive,الكمية لاستقبال
DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,عامل التحويل لا يمكن أن يكون في الكسور
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,سوف استخدامه لتسجيل الدخول
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,معامل التحويل لا يمكن أن يكون في الكسور
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,ستستخدم هذا لتسجيل الدخول
DocType: Sales Partner,Retailer,متاجر التجزئة
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع مزود
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
-DocType: Sales Order,% Delivered,ألقيت٪
+DocType: Sales Order,% Delivered,تم إيصاله٪
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,جعل زلة الراتب
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,نزع السدادة
@@ -2553,7 +2553,7 @@
DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} تم إدخال أكثر من مرة واحدة في البند المتغيرات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} تم إدخال أكثر من مرة واحدة في أنواع الصنف الجدول
,Projected,المتوقع
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},المسلسل لا {0} لا ينتمي إلى مستودع {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},ملاحظة: مرجع التسجيل يتجاوز أيام الائتمان المسموح به من قبل {0} يوما ل{1} {2}
@@ -2581,7 +2581,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,على سبيل المثال ضريبة
DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
DocType: Shopping Cart Settings,Quotation Series,اقتباس السلسلة
-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",عنصر موجود مع نفس الاسم ( {0} ) ، الرجاء تغيير اسم المجموعة البند أو إعادة تسمية هذا البند
+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",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,الغاز المعدن الساخن تشكيل
DocType: Sales Order Item,Sales Order Date,مبيعات الترتيب التاريخ
DocType: Sales Invoice Item,Delivered Qty,تسليم الكمية
@@ -2650,7 +2650,7 @@
DocType: Expense Claim,Task,مهمة
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Shaving,حلق
DocType: Purchase Taxes and Charges,Reference Row #,مرجع صف #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},رقم الدفعة إلزامي القطعة ل{0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},رقم الباتش إلزامي للصنف{0}
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
,Stock Ledger,الأسهم ليدجر
DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
@@ -2697,7 +2697,7 @@
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.",قائمة رؤساء الضريبية الخاصة بك (على سبيل المثال ضريبة القيمة المضافة، الضرائب ، بل ينبغي لها أسماء فريدة من نوعها ) و معدلاتها القياسية.
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than 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} ليس رقم الدفعة صالحة لل تفاصيل {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {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.",ملاحظة: إذا لم يتم الدفع ضد أي إشارة، وجعل الدخول مجلة يدويا.
DocType: Item,Supplier Items,المورد الأصناف
@@ -2749,7 +2749,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,الخدمات المصرفية الاستثمارية
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency",اختر بلدك، المنطقة الزمنية والعملات
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} هو الوضع تتفتح
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} الوضع (غير متوقف)
DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,تخليل
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,صب الرمل
@@ -2810,7 +2810,7 @@
DocType: Quotation,Maintenance Manager,مدير الصيانة
DocType: Workflow State,Search,البحث
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,إجمالي لا يمكن أن يكون صفرا
-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,"""أيام منذ بالدفع آخر "" يجب أن تكون أكبر من أو تساوي الصفر"
+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,"""عدد الأيام منذ آخر طلب "" يجب أن تكون أكبر من أو تساوي الصفر"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,مختلط
DocType: C-Form,Amended From,عدل من
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,المواد الخام
@@ -2849,7 +2849,7 @@
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,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
DocType: Lead,Lead Type,نوع مبادرة البيع
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,إنشاء اقتباس
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,وقد تم بالفعل فاتورة كل هذه العناصر
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن أن يكون وافق عليها {0}
DocType: Shipping Rule,Shipping Rule Conditions,الشحن شروط القاعدة
DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
@@ -2867,7 +2867,7 @@
DocType: Features Setup,Item Groups in Details,المجموعات في البند تفاصيل
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,حساب المصاريف إلزامي
apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),بداية في نقاط البيع (POS)
-DocType: Item,A new variant (Item) will be created for each attribute value combination,سيتم إنشاء متغير جديد (بند) لكل مجموعة قيمة السمة
+DocType: Item,A new variant (Item) will be created for each attribute value combination,سيتم إنشاء متغير جديد (صنف) لكل مجموعة قيمة
apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,تقرير زيارة للدعوة الصيانة.
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: Pricing Rule,Customer Group,مجموعة العملاء
@@ -2912,7 +2912,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,تثقيب
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,من الكمية
apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,سلسلة إلزامي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,الترقيم المتسلسل إلزامي
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,الخدمات المالية
DocType: Opportunity,Sales,مبيعات
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
@@ -2925,7 +2925,7 @@
DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,تلبد
DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
-DocType: Naming Series,Setup Series,سلسلة الإعداد
+DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
DocType: Supplier,Contact HTML,الاتصال HTML
DocType: Landed Cost Voucher,Purchase Receipts,إيصالات شراء
DocType: Payment Reconciliation,Maximum Amount,أقصى مبلغ
@@ -2961,13 +2961,13 @@
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,إجمالي الإيرادات
,Monthly Attendance Sheet,ورقة الحضور الشهرية
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,العثور على أي سجل
-apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي القطعة ل{2}
+apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي للصنف {2}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,حساب {0} غير نشط
DocType: GL Entry,Is Advance,هو المقدمة
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,الحضور من التسجيل والحضور إلى تاريخ إلزامي
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
DocType: Sales Team,Contact No.,الاتصال رقم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"الربح و الخسارة "" نوع الحساب {0} غير مسموح به في افتتاح الدخول"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
DocType: Workflow State,Time,مرة
DocType: Features Setup,Sales Discounts,مبيعات خصومات
DocType: Hub Settings,Seller Country,البائع البلد
@@ -2983,7 +2983,7 @@
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,إضافة الطفل
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,دور السماح للتعيين الحسابات المجمدة وتحرير مقالات المجمدة
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى دفتر الأستاذ كما فعلت العقد التابعة
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,مطلوب عامل التحويل
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,مطلوب معامل التحويل
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +32,Serial #,المسلسل #
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,عمولة على المبيعات
DocType: Offer Letter Term,Value / Description,قيمة / الوصف
@@ -3004,7 +3004,7 @@
DocType: Sales Order,% Amount Billed,المبلغ٪ صفت
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,مصاريف الهاتف
DocType: Sales Partner,Logo,شعار
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} الأرقام التسلسلية المطلوبة القطعة ل {0} . فقط {0} المقدمة.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} الأرقام التسلسلية المطلوبة للصنف {0} . فقط {0} المقدمة.
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 +108,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,المصاريف المباشرة
@@ -3081,8 +3081,8 @@
DocType: Purchase Order Item,Supplier Quotation,اقتباس المورد
DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,الكي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} غير توقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},الباركود {0} تستخدم بالفعل في البند {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} لم يتوقف
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مطلوب العملاء
@@ -3105,7 +3105,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
DocType: Serial No,Out of Warranty,لا تغطيه الضمان
DocType: BOM Replace Tool,Replace,استبدل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} ضد فاتورة المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
DocType: Purchase Invoice Item,Project Name,اسم المشروع
DocType: Workflow State,Edit,تحرير
@@ -3168,7 +3168,7 @@
DocType: Batch,Batch ID,دفعة ID
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},ملاحظة : {0}
,Delivery Note Trends,ملاحظة اتجاهات التسليم
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون البند شراؤها أو التعاقد الفرعي في الصف {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
DocType: GL Entry,Party,الطرف
DocType: Sales Order,Delivery Date,تاريخ التسليم
@@ -3192,7 +3192,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,حسابات مؤقتة
DocType: Payment Tool,Column Break 1,استراحة العمود 1
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,أسود
-DocType: BOM Explosion Item,BOM Explosion Item,BOM انفجار الإغلاق
+DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
DocType: Account,Auditor,مدقق حسابات
DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
@@ -3208,7 +3208,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,تشطيب المغزل
-DocType: Material Request,% of materials ordered against this Material Request,٪ من المواد المطلوبة ضد هذه المادة طلب
+DocType: Material Request,% of materials ordered against this Material Request,٪ من المواد طلبت مقابل أمر التزويد
DocType: BOM,Last Purchase Rate,أخر سعر توريد
DocType: Account,Asset,الأصول
DocType: Project Task,Task ID,ID مهمة
@@ -3220,7 +3220,7 @@
apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,سجل للحصول على ERPNext المحور
DocType: Monthly Distribution,Monthly Distribution Percentages,النسب المئوية لتوزيع الشهرية
apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
-DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة ضد هذا التسليم ملاحظة
+DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة سلمت من أمر التوصيل
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stapling,التدبيس
DocType: Customer,Customer Details,تفاصيل العملاء
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Shaping,تشكيل
@@ -3228,7 +3228,7 @@
DocType: SMS Settings,Enter url parameter for receiver nos,أدخل عنوان URL لمعلمة NOS استقبال
DocType: Sales Invoice,Paid Amount,المبلغ المدفوع
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',إغلاق الحساب {0} يجب أن تكون من النوع ' المسؤولية '
-,Available Stock for Packing Items,الأسهم المتاحة للتعبئة وحدات
+,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Reserved Warehouse is missing in Sales Order,المحجوزة مستودع مفقود في ترتيب المبيعات
DocType: Item Variant,Item Variant,البديل البند
apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
@@ -3276,9 +3276,9 @@
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,عقدة المجموعة
DocType: Payment Reconciliation,Minimum Amount,الحد الأدنى المبلغ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,تحديث السلع منتهية
-DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",ضبط تلقائيا. إذا كان هذا البند لديها بدائل، ثم فإنه لا يمكن تحديدها في أوامر البيع الخ
+DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",ضبط تلقائيا. إذا كان هذا الصنف لديه بدائل، ثم فإنه لا يمكن تحديدها في أوامر البيع الخ
DocType: Workstation,per hour,كل ساعة
-apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},سلسلة {0} تستخدم بالفعل في {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},الترقيم المتسلسل {0} مستخدم بالفعل في {1}
DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب.
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
DocType: Company,Distribution,التوزيع
@@ -3374,7 +3374,7 @@
DocType: Purchase Order,Raw Materials Supplied,المواد الخام الموردة
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}),التقييم الإجمالي ({0}) لتصنيعها أو إعادة تعبئتها البند (ق) لا يمكن أن يكون أقل من التقييم الكلي للمواد الخام ({1})
DocType: Email Digest,New Projects,مشاريع جديدة
-DocType: Communication,Series,سلسلة
+DocType: Communication,Series,سلسلة ترقيم الوثيقة
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ طلب شراء
DocType: Appraisal,Appraisal Template,تقييم قالب
DocType: Communication,Email,البريد الإلكتروني
@@ -3420,12 +3420,12 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,لم يتم العثور على مستودع في النظام
DocType: Quality Inspection Reading,Quality Inspection 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.,` تجميد الأرصدة أقدم من يجب أن يكون أصغر من ٪ d يوم ` .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
,Project wise Stock Tracking,مشروع تتبع حركة الأسهم الحكمة
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},جدول الصيانة {0} موجود ضد {0}
DocType: Stock Entry Detail,Actual Qty (at source/target),الكمية الفعلية (في المصدر / الهدف)
DocType: Item Customer Detail,Ref Code,الرمز المرجعي لل
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,موظف السجلات.
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,سجلات الموظفين
DocType: HR Settings,Payroll Settings,إعدادات الرواتب
apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
DocType: Email Digest,New Purchase Orders,أوامر الشراء الجديدة
@@ -3455,7 +3455,7 @@
DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
DocType: Maintenance Visit,Fully Completed,يكتمل
DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.",سيتم فرز المنتجات حسب العمر، الوزن في عمليات البحث الافتراضي. أكثر من الوزن في سن، وأعلى المنتج تظهر في القائمة.
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ كاملة
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
DocType: Employee,Educational Qualification,المؤهلات العلمية
DocType: Workstation,Operating Costs,تكاليف التشغيل
DocType: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
@@ -3512,7 +3512,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
DocType: Naming Series,Help HTML,مساعدة HTML
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
-apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},بدل لأكثر من {0} عبرت القطعة ل{1}
+apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,لديك موردون
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
@@ -3537,7 +3537,7 @@
DocType: Delivery Note,To Warehouse,لمستودع
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},تم إدخال حساب {0} أكثر من مرة للعام المالي {1}
,Average Commission Rate,متوسط العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"' ليس لديه المسلسل "" لا يمكن أن يكون "" نعم "" ل عدم الأسهم البند"
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"' لا يحوي رقم متسلسل "" لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
DocType: Pricing Rule,Pricing Rule Help,تعليمات التسعير القاعدة
DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
@@ -3571,7 +3571,7 @@
DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,توليد قسائم راتب
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} ليس معرف بريد إلكتروني صحيح
+apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} بريد إلكتروني غير صحيح
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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: ToDo,Low,منخفض
@@ -3631,7 +3631,7 @@
DocType: Contact Us Settings,City,مدينة
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,بالموجات فوق الصوتية بالقطع
apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
-DocType: Naming Series,Update Series Number,تحديث سلسلة رقم
+DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
DocType: Account,Equity,إنصاف
DocType: Task,Closing Date,تاريخ الإنتهاء
DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
@@ -3639,7 +3639,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
DocType: Sales Partner,Partner Type,نوع الشريك
DocType: Purchase Taxes and Charges,Actual,فعلي
-DocType: Purchase Order,% of materials received against this Purchase Order,تلقى٪ من المواد ضد هذا أمر الشراء
+DocType: Purchase Order,% of materials received against this Purchase Order,تلقى٪ من المواد مقابل أمر الشراء
DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
DocType: Purchase Invoice,Against Expense Account,ضد حساب المصاريف
DocType: Production Order,Production Order,الإنتاج ترتيب
@@ -3655,7 +3655,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,جزئي
DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
DocType: Employee,Cheque,شيك
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,سلسلة تحديث
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,تم تحديث الرقم المتسلسل
apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Report Type is mandatory,تقرير نوع إلزامي
DocType: Item,Serial Number Series,المسلسل عدد سلسلة
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
@@ -3684,7 +3684,7 @@
DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""التبليغ عناوين"" غير محددة لالمتكررة٪ الصورة"
+apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه"" غير محددة للمدخلات المتكررة %s"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,طحن
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,القضم
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
@@ -3706,7 +3706,7 @@
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,إظهار القيم الصفر
DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
-DocType: Delivery Note Item,Against Sales Order Item,ضد ترتيب المبيعات البند
+DocType: Delivery Note Item,Against Sales Order Item,مقابل المبيعات
DocType: Item,Default Warehouse,النماذج الافتراضية
DocType: Task,Actual End Date (via Time Logs),الفعلي تاريخ الانتهاء (عبر الزمن سجلات)
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأصل
@@ -3744,7 +3744,7 @@
DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,الحفاظ على نفس المعدل خلال دورة المبيعات
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},لا يمكن أن يعود أكثر من {0} القطعة ل {1}
DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات العمل محطة العمل.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} وقد تم بالفعل قدمت
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} قد تم بالفعل تأكيده
,Items To Be Requested,البنود يمكن طلبه
DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
DocType: Company,Company Info,معلومات عن الشركة
@@ -3758,7 +3758,7 @@
DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
DocType: Purchase Common,Purchase Common,شراء المشتركة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} تم تعديل . يرجى تحديث.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/selling/doctype/quotation/quotation.js +626,From Opportunity,من الفرص
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,تقطيع
@@ -3771,7 +3771,7 @@
DocType: DocField,Default,الافتراضي
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",واختيار "نعم" السماح لهذا البند يظهر في أمر الشراء، وتلقي شراء.
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,وأضاف {0} المشتركين
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} مشتركين تم اضافتهم
DocType: Maintenance Schedule,Schedule,جدول
DocType: Account,Parent Account,الأصل حساب
DocType: Serial No,Available,متاح
@@ -3813,7 +3813,7 @@
DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
DocType: Production Order,Actual Start Date,تاريخ البدء الفعلي
-DocType: Sales Order,% of materials delivered against this Sales Order,٪ من المواد الموردة ضد هذا أمر المبيعات
+DocType: Sales Order,% of materials delivered against this Sales Order,٪ من المواد الموردة أوصلت مقابل أمر المبيعات
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,تسجيل حركة البند.
DocType: Newsletter List Subscriber,Newsletter List Subscriber,قائمة النشرة المشترك
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Morticing
diff --git a/erpnext/translations/cz.csv b/erpnext/translations/cs.csv
similarity index 100%
rename from erpnext/translations/cz.csv
rename to erpnext/translations/cs.csv
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index c385e08..dbb1b7b 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -2150,7 +2150,7 @@
DocType: Global Defaults,For automatic exchange rates go to jsonrates.com and signup for an API key,Für die automatische Wechselkurse gehen jsonrates.com und signup für einen API-Schlüssel
apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen
DocType: Company,Stock Settings,Bestandseinstellungen
-DocType: User,Bio,Bio
+DocType: User,Bio,Lebenslauf
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","Merging ist nur möglich, wenn folgende Eigenschaften sind in beiden Datensätzen. Ist Group, der Starttyp, Company"
apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,Verwalten von Kundengruppen
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Neue Kostenstellennamen
@@ -2568,7 +2568,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +680,From Sales Order,Aus Kundenauftrag
DocType: Blog Category,Parent Website Route,Eltern- Webseite Routen
DocType: Sales Order,Not Billed,nicht abgerechnet
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Gesellschaft gehören
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
sites/assets/js/erpnext.min.js +20,No contacts added yet.,Noch keine Kontakte hinzugefügt.
apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nicht aktiv
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +43,Against Invoice Posting Date,Gegen Rechnung Buchungsdatum
@@ -3531,7 +3531,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +63,You are not authorized to set Frozen value,Sie haben keine Berechtigung eingefrorene Werte zu setzen
DocType: Payment Reconciliation,Get Unreconciled Entries,Holen Nicht abgestimmte Einträge
DocType: Purchase Receipt,Date on which lorry started from supplier warehouse,Abfahrtdatum des LKW aus dem Lieferantenlager
-DocType: Cost Center,Budgets,Haushalts
+DocType: Cost Center,Budgets,Haushalte
apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualisiert
DocType: Employee,Emergency Contact Details,Notfallkontaktdaten
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it do?,Unternehmenszweck?
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index bb65c0f..fad7fec 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -30,7 +30,7 @@
DocType: Job Applicant,Job Applicant,solicitante de empleo
apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Impuesto de tipo real no puede ser incluido en el precio del artículo en la fila {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},La tarifa actual no puede ser incluida en el precio del artículo en la fila {0}
DocType: C-Form,Customer,Cliente
DocType: Purchase Receipt Item,Required By,Requerido por
DocType: Department,Department,Departamento
@@ -77,13 +77,13 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Tratamiento de la madera
DocType: Production Order Operation,Work In Progress,Trabajos en Curso
DocType: Company,If Monthly Budget Exceeded,Si Presupuesto mensual excedido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,La impresión 3D
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impresión 3D
DocType: Employee,Holiday List,Lista de Feriados
DocType: Time Log,Time Log,Hora de registro
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Contador
DocType: Company,Phone No,Teléfono No
DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bitácora de actividades realizadas por los usuarios frente a las tareas que se pueden utilizar para el tiempo de seguimiento, facturación."
-apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nueva {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nuevo {0}: # {1}
,Sales Partners Commission,Comisión del Socio de Ventas
apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
DocType: Backup Manager,Allow Google Drive Access,Permitir Acceso a Google Drive
@@ -120,7 +120,7 @@
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,El Artículo Principal {0} no debe ser un elemento en Stock y debe ser un Artículo para Venta
DocType: Item,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Tiempo real de la Operación
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la Operación
DocType: SMS Log,SMS Log,SMS Iniciar sesión
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: Blog Post,Guest,Invitado
@@ -153,7 +153,7 @@
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
DocType: Naming Series,Prefix,Prefijo
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,Consumible
-DocType: Upload Attendance,Import Log,Importar registro
+DocType: Upload Attendance,Import Log,Importar Registro
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
DocType: SMS Center,All Contact,Todos los Contactos
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Salario Anual
@@ -221,7 +221,7 @@
DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},Almacén Reservado requerido para la acción del artículo {0} en la fila {1}
DocType: Sales Invoice,Is Opening Entry,Es la entrada de apertura
-DocType: Supplier,Mention if non-standard receivable account applicable,Mencione si cuenta por cobrar no estándar aplicable
+DocType: Supplier,Mention if non-standard receivable account applicable,Mencione si cuenta por cobrar no estándar es aplicable
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,Para se requiere antes de Almacén Enviar
DocType: Sales Partner,Reseller,Reseller
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,Por favor introduzca Company
@@ -291,7 +291,7 @@
DocType: Email Digest,New Quotations,Nuevas Citas
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +194,Select Your Language,Seleccione su idioma
DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
-DocType: Accounts Settings,Settings for Accounts,Ajustes de Cuentas
+DocType: Accounts Settings,Settings for Accounts,Ajustes de Contabilidad
apps/erpnext/erpnext/config/crm.py +80,Manage Sales Person Tree.,Administrar Árbol de Personal de Ventas.
DocType: Item,Synced With Hub,Sincronizado con Hub
DocType: Item,Variant Of,Variante de
@@ -303,7 +303,7 @@
DocType: Period Closing Voucher,Closing Account Head,Cierre Cuenta Principal
DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer grupo""> Añadir / Editar < / a>"
DocType: Employee,External Work History,Historial de trabajo externo
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referencia Circular Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error Referencia Circular
DocType: ToDo,Closed,Cerrado
DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Export ) será visible una vez que guarde la nota de entrega .
DocType: Lead,Industry,Industria
@@ -360,15 +360,15 @@
DocType: Quality Inspection,Inspected By,Inspección realizada por
DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Artículo Calidad de parámetros de Inspección
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del Articulo
DocType: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
,Schedule Date,Horario Fecha
DocType: Packed Item,Packed Item,Artículo Empacado
apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Ajustes por defecto para de las transacciones de compra.
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Existe Costo Actividad de Empleado {0} contra el Tipo de Actividad - {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.,"Por favor, no crear cuentas de clientes y proveedores. Se crean directamente de los maestros al cliente / proveedor."
+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.,"Por favor, NO crear cuentas de clientes y proveedores. Se crean directamente de los maestros de clientes/proveedores."
DocType: Currency Exchange,Currency Exchange,Cambio de Divisas
-DocType: Purchase Invoice Item,Item Name,Nombre del elemento
+DocType: Purchase Invoice Item,Item Name,Nombre del Articulo
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
DocType: Employee,Widowed,Viudo
DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados en Cantidad proyectada y pedido mínimo Cantidad"
@@ -428,7 +428,7 @@
DocType: Packing Slip,From Package No.,Del Paquete N º
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y Depósitos
DocType: Features Setup,Imports,Importaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,La unión adhesiva
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,Union adhesiva
DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de Asistencia .
DocType: Bank Reconciliation,Journal Entries,Comprobantes de Diario
@@ -461,7 +461,7 @@
DocType: Backup Manager,Email ids separated by commas.,ID de correos electrónicos separados por comas.
DocType: Communication,Subject,Sujeto
DocType: Item,"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Seleccione "" Sí"" si este artículo representa un poco de trabajo al igual que la formación, el diseño, consultoría , etc"
-DocType: Shipping Rule,Net Weight,Peso neto
+DocType: Shipping Rule,Net Weight,Peso Neto
DocType: Employee,Emergency Phone,Teléfono de Emergencia
DocType: Backup Manager,Google Drive Access Allowed,Google Drive Acceso Permitido
,Serial No Warranty Expiry,Número de orden de caducidad Garantía
@@ -569,7 +569,7 @@
sites/assets/js/form.min.js +253,To,a
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,End tube forming,Fin tubo formando
-DocType: Production Order Operation,In minutes,En cuestión de minutos
+DocType: Production Order Operation,In minutes,En minutos
DocType: Issue,Resolution Date,Fecha de Resolución
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, ajuste de cuenta bancaria Efectivo por defecto o en el modo de pago {0}"
DocType: Selling Settings,Customer Naming By,Naming Cliente Por
@@ -602,7 +602,7 @@
DocType: Sales Order Item,Basic Rate (Company Currency),Tarifa Base (Moneda Local)
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,Por favor ingrese los detalles del artículo
DocType: Purchase Receipt,Other Details,Otros Datos
-DocType: Account,Accounts,Cuentas
+DocType: Account,Accounts,Contabilidad
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,Esquila Heterosexual
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.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
@@ -750,10 +750,10 @@
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","Para realizar el seguimiento de marca en el siguiente documento Nota de entrega , Oportunidad , solicitud de material , artículo , Orden de Compra, Comprar Bono , el recibo de compra , cotización , factura de venta , lista de materiales de ventas , órdenes de venta , Número de Serie"
DocType: Production Order,Target Warehouse,Inventario Objetivo
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,Fecha prevista de entrega no puede ser anterior Fecha de órdenes de venta
-DocType: Upload Attendance,Import Attendance,Asistente de importación
+DocType: Upload Attendance,Import Attendance,Asistente de Importación
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
DocType: Salary Manager,Activity Log,Registro de Actividad
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad Neta / Pérdida
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neta / Pérdida Utilidad
apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,Fundición de molde permanente
@@ -857,7 +857,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,Químico
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
DocType: Salary Manager,Select Payroll Year and Month,Seleccione nómina Año y Mes
-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""",Ir al grupo apropiado (generalmente Aplicación de Fondos> Activo Circulante> Cuentas Bancarias y crear una nueva cuenta (haciendo clic en Añadir niño) de tipo "Banco"
+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""","Ir al grupo apropiado (generalmente Aplicación de Fondos> Activo Circulante> Cuentas Bancarias y crear una nueva cuenta (haciendo clic en Añadir hijo) de tipo ""Banco"""
DocType: Workstation,Electricity Cost,Coste de electricidad
DocType: HR Settings,Don't send Employee Birthday Reminders,No envíe Empleado Birthday Reminders
DocType: Comment,Unsubscribed,No Suscrito
@@ -940,7 +940,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,Compra estándar
DocType: GL Entry,Against,Contra
DocType: Item,Default Selling Cost Center,Centros de coste por defecto
-DocType: Sales Partner,Implementation Partner,socio de implementación
+DocType: Sales Partner,Implementation Partner,Socio de Implementación
DocType: Purchase Invoice,Contact Info,Información de Contacto
DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Make Purchase Receipt,Hacer recibo de compra
@@ -993,7 +993,7 @@
apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear Oportunidad
DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
DocType: Supplier,Communications,Comunicaciones
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Planificación de la capacidad de error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Error en la Planificación de la Capacidad
DocType: Lead,Consultant,Consultor
DocType: Salary Slip,Earnings,Ganancias
DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
@@ -1010,7 +1010,7 @@
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo ' Grupo '
DocType: Item,UOMs,Unidades de Medida
apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} No Serie válidos para el elemento {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Código del artículo no se puede cambiar de número de serie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Código del Artículo no se puede cambiar de Número de Serie
DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Laminated object manufacturing,Fabricación de objetos laminado
@@ -1019,13 +1019,13 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +596,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Stretch forming,Formando Stretch
DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
-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","Otras cuentas se pueden hacer en Grupos, pero las entradas se pueden hacer contra los no Grupos"
+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","Otras cuentas se pueden organizar dentro de Grupos, pero las entradas solò se pueden hacer contra los que no son de Grupo"
apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
DocType: Lead,Lead,Iniciativa
DocType: Email Digest,Payables,Cuentas por Pagar
DocType: Account,Warehouse,Almacén
,Purchase Order Items To Be Billed,Artículos de Orden de Compra a Facturar
-DocType: Purchase Invoice Item,Net Rate,Tasa neta
+DocType: Purchase Invoice Item,Net Rate,Tasa Neta
DocType: Backup Manager,Database Folder ID,Base de Datos de Identificación de carpetas
DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
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,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
@@ -1058,7 +1058,7 @@
,Budget Variance Report,Informe de Varianza en el Presupuesto
DocType: Salary Slip,Gross Pay,Pago bruto
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagados
-DocType: Stock Reconciliation,Difference Amount,Diferencia Monto
+DocType: Stock Reconciliation,Difference Amount,Diferencia
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Ganancias Retenidas
DocType: Purchase Order,Required raw materials issued to the supplier for producing a sub - contracted item.,Las materias primas necesarias emitidas al proveedor para la producción de un ítem sub - contratado .
DocType: BOM Item,Item Description,Descripción del Artículo
@@ -1110,8 +1110,8 @@
DocType: Purchase Invoice,Recurring Type,Tipo Recurrente
DocType: Address,City/Town,Ciudad/Provincia
DocType: Serial No,Serial No Details,Serial No Detalles
-DocType: Purchase Invoice Item,Item Tax Rate,Tasa de Impuesto del artículo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, sólo las cuentas de crédito se pueden vincular con otro asiento de débito"
+DocType: Purchase Invoice Item,Item Tax Rate,Tasa de Impuesto del Artículo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con otro asiento de débito"
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
apps/erpnext/erpnext/stock/get_item_details.py +137,Item {0} must be a Sub-contracted Item,Artículo {0} debe ser un artículo subcontratada
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipos de Capitales
@@ -1126,7 +1126,7 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
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""","Sólo puede haber una Condición de Regla de Envió con valor 0 o valor en blanco para ""To Value"""
DocType: DocType,Transaction,Transacción
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden hacer asientos contables en contra de grupos.
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un Grupo. No se pueden hacer asientos contables en contra de Grupos.
apps/erpnext/erpnext/config/projects.py +43,Tools,Herramientas
DocType: Sales Taxes and Charges Template,Valid For Territories,Válido para Territorios
DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
@@ -1252,7 +1252,7 @@
DocType: Packing Slip,Packing Slip,El resbalón de embalaje
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
apps/erpnext/erpnext/config/setup.py +80,Setup SMS gateway settings,Configuración de puerta de enlace de configuración de SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,Import Error !
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,¡Importación Fallida!
sites/assets/js/erpnext.min.js +19,No address added yet.,No se ha añadido ninguna dirección todavía.
DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Analista
@@ -1292,7 +1292,7 @@
DocType: Purchase Order Item Supplied,BOM Detail No,Número de Detalle en la Solicitud de Materiales
DocType: Period Closing Voucher,CoA Help,CoA Ayuda
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +533,Error: {0} > {1},Error: {0} > {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta de Plan General de Contabilidad ."
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad ."
DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo de Clientes> Territorio
DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lote Cantidad en almacén
@@ -1344,8 +1344,8 @@
DocType: Production Planning Tool,Select Sales Orders,Selección de órdenes de venta
,Material Requests for which Supplier Quotations are not created,Las Solicitudes de Material para los que no se crearon Cotizaciones del Proveedor
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.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hacer Cita
-DocType: Dependent Task,Dependent Task,Tarea dependiente
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hacer Proforma
+DocType: Dependent Task,Dependent Task,Tarea Dependiente
apps/erpnext/erpnext/stock/doctype/item/item.py +291,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversión de unidad de medida predeterminada debe ser de 1 en la fila {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.,"No se puede introducir tanto ""No de Nota de Entrega"" y ""No de Factura"". Por favor ingrese cualquiera ."
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
@@ -1377,7 +1377,7 @@
DocType: Party Type,Contacts,Contactos
apps/erpnext/erpnext/config/website.py +13,"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/page/setup_wizard/setup_wizard.js +601,Setup Complete,Configuración completa
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Anunciado
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Facturado
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,Cant. Reservada
DocType: Party Account,Party Account,Cuenta de la Partida
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Recursos Humanos
@@ -1399,7 +1399,7 @@
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/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
DocType: Quotation,Term Details,Detalles de los Terminos
-DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de la capacidad para (Días)
+DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de la Capacidad para (Días)
DocType: Warranty Claim,Warranty Claim,Reclamación de la Garantía
,Lead Details,Detalle de la Iniciativa
DocType: Authorization Rule,Approving User,Aprobar Usuario
@@ -1420,12 +1420,12 @@
DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir Deducción por Licencia sin Sueldo ( LWP )
DocType: Territory,Territory Manager,Gerente de Territorio
DocType: Selling Settings,Selling Settings,Configuración de Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,El artículo no puede ser una variante de una variante
+apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,El Artículo no puede ser una variante de una variante
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Online Auctions,Subastas en Línea
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Please specify either Quantity or Valuation Rate or both,Por favor especificar Cantidad o valoración de tipo o ambos
apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +36,"Company, Month and Fiscal Year is mandatory","Empresa, Mes y Año Fiscal es obligatorio"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Gastos de Comercialización
-,Item Shortage Report,Reportar escasez del artículo
+,Item Shortage Report,Reportar Escasez del Artículo
apps/erpnext/erpnext/stock/doctype/item/item.js +208,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
DocType: Journal Entry,View Details,Ver detalles
@@ -1451,7 +1451,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Quantity required for Item {0} in row {1},Cantidad requerida para el punto {0} en la fila {1}
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,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: Quotation,Order Type,Tipo de Orden
-DocType: Purchase Invoice,Notification Email Address,Email de notificación
+DocType: Purchase Invoice,Notification Email Address,Correo Electronico de Notificación
DocType: Payment Tool,Find Invoices to Match,Encuentra facturas para que coincida
,Item-wise Sales Register,- Artículo sabio ventas Registrarse
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
@@ -1466,7 +1466,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Principal
DocType: DocPerm,Delete,Eliminar
apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +836,New {0},Nueva {0}
+sites/assets/js/desk.min.js +836,New {0},Nuevo {0}
DocType: Naming Series,Set prefix for numbering series on your transactions,Establecer prefijo de numeración de serie en sus transacciones
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,Por defecto la lista de materiales ({0}) debe estar activo para este material o su plantilla
@@ -1521,7 +1521,7 @@
DocType: Packing Slip,To Package No.,Al paquete No.
DocType: DocType,System,Sistema
DocType: Warranty Claim,Issue Date,Fecha de Emisión
-DocType: Activity Cost,Activity Cost,Costo Actividad
+DocType: Activity Cost,Activity Cost,Costo de Actividad
DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad Consumida
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Telecomunicaciones
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borrador)
@@ -1554,7 +1554,7 @@
Monto Remanente {2}"
DocType: Backup Manager,Dropbox Access Secret,Acceso Secreto de Dropbox
DocType: Purchase Invoice,Recurring Invoice,Factura Recurrente
-DocType: Item,Net Weight of each Item,Peso neto de cada artículo
+DocType: Item,Net Weight of each Item,Peso Neto de cada Artículo
DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
DocType: Budget Detail,Fiscal Year,Año Fiscal
DocType: Cost Center,Budget,Presupuesto
@@ -1815,7 +1815,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +236,BOM recursion: {0} cannot be parent or child of {2},Recursividad de Solicitud de Materiales: {0} no puede ser padre o hijo de {2}
DocType: Production Order Operation,Completed Qty,"Cantidad Completada
"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, sólo las cuentas de débito pueden ser enlazados con otra entrada de crédito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden ser enlazados con otra entrada de crédito"
apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,Lista de precios {0} está deshabilitado
DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,Orden de Venta {0} esta detenida
@@ -1907,7 +1907,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Cantidad en la fila {0} ({1} ) debe ser la misma que la cantidad fabricada {2}
DocType: Appraisal,Employee,Empleado
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importación de correo electrónico De
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar Correo Electrónico de:
DocType: Features Setup,After Sale Installations,Instalaciones Post Venta
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} está totalmente facturado
DocType: Workstation Working Hour,End Time,Hora de Finalización
@@ -2050,7 +2050,7 @@
DocType: Note,Note,nota
DocType: Email Digest,New Material Requests,Nueva Solicitud de Material
DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
-DocType: Email Account,Email Ids,Email Ids
+DocType: Email Account,Email Ids,IDs de Correo Electrónico
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir más artículo {0} que en la cantidad de pedidos de cliente {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,Establecer como destapados
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
@@ -2120,7 +2120,7 @@
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,Respaldos serán subidos a
DocType: Account,Income Account,Cuenta de Ingresos
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,Moldura
-DocType: Stock Reconciliation Item,Current Qty,Cantidad actual
+DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte "" Cambio de materiales a base On"" en la sección Cálculo del coste"
DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
@@ -2170,7 +2170,7 @@
,Sales Browser,Navegador de Ventas
DocType: Journal Entry,Total Credit,Crédito Total
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,local
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,Local
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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +142,Large,Grande
@@ -2196,8 +2196,8 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadoras
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Electro-chemical grinding,Electro-química de molienda
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Se trata de un grupo de clientes raíz y no se puede editar .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los comentarios de Contabilidad"
-DocType: Purchase Invoice,Ignore Pricing Rule,No haga caso de la Regla Precios
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los Registros de Contabilidad"
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la Regla Precios
sites/assets/js/list.min.js +23,Cancelled,Cancelado
DocType: Employee Education,Graduate,Graduado
DocType: Leave Block List,Block Days,Bloquear Días
@@ -2260,8 +2260,8 @@
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
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
DocType: Purchase Invoice,Discount Amount (Company Currency),Importe del Descuento (Moneda Local)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} ha sido éxito de baja de esta lista.
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Compañía moneda)
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa Neta (Moneda Local)
apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Administrar Árbol de Territorio.
DocType: Payment Reconciliation Payment,Sales Invoice,Factura de Venta
DocType: Journal Entry Account,Party Balance,Equilibrio Partido
@@ -2294,7 +2294,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,Rocíe la formación
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,Cuenta {0} está congelada
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un gráfico separado de cuentas que pertenecen a la Organización.
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
apps/erpnext/erpnext/config/setup.py +116,Address master.,Dirección Principal.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
@@ -2480,7 +2480,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,Lo utilizará para iniciar sesión
DocType: Sales Partner,Retailer,detallista
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los Tipos de proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,Código del artículo es obligatorio porque El artículo no se numera automáticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,Código del Artículo es obligatorio porque el Artículo no se enumera automáticamente
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
DocType: Sales Order,% Delivered,% Entregado
@@ -2488,7 +2488,7 @@
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Continuar
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
-apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignoreado:
+apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignorado:
apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} no se puede comprar con el carrito
apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo inicial Equidad
@@ -2509,7 +2509,7 @@
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: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Compañía moneda)
DocType: BOM Operation,Hour Rate,Hora de Cambio
-DocType: Stock Settings,Item Naming By,Artículo Naming Por
+DocType: Stock Settings,Item Naming By,Nombres de Artículos por
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,desde la cotización
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la Fabricación
@@ -2670,7 +2670,7 @@
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,Reordenar Cantidad
DocType: Company,Stock Adjustment Account,Cuenta de Ajuste de existencias
DocType: Sales Invoice,Write Off,Cancelar
-DocType: Time Log,Operation ID,Operación ID
+DocType: Time Log,Operation ID,ID de Operación
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/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
DocType: Task,depends_on,depende de
@@ -2708,7 +2708,7 @@
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.,Número incorrecto de entradas del libro mayor encontrado. Es posible que haya seleccionado una cuenta equivocada en la transacción.
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una Cuenta Bancaria
DocType: Hub Settings,Publish Availability,Publicar disponibilidad
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Fecha de nacimiento no puede ser mayor que la actual.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Fecha de nacimiento no puede ser posterior a la fecha de hoy.
,Stock Ageing,Envejecimiento de existencias
DocType: Purchase Receipt,Automatically updated from BOM table,Actualizado automáticamente en el cuadro de lista de materiales
apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}' no esta activado
@@ -2725,7 +2725,7 @@
DocType: Sales Person,Sales Person Name,Nombre del Vendedor
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Por favor introduzca al menos 1 de facturas en la tabla
DocType: Pricing Rule,Item Group,Grupo de artículos
-DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio real (a través de los registros de tiempo)
+DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (via Registros Temporales)
DocType: Stock Reconciliation Item,Before reconciliation,Antes de la reconciliación
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
@@ -2739,7 +2739,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},El total de Débitos debe ser igual al total de Créditos. La diferencia es {0}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Automotor
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0}
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Se requiere de artículos
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Articulo es requerido
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,Moldeo por inyección de metal
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,De la nota de entrega
DocType: Time Log,From Time,From Time
@@ -2836,7 +2836,7 @@
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,Entretenimiento y Ocio
DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
-DocType: Quality Inspection,Item Serial No,N º de serie del artículo
+DocType: Quality Inspection,Item Serial No,Nº de Serie del Artículo
apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Presente
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,Hora
@@ -2885,12 +2885,12 @@
DocType: POS Setting,POS Setting,POS Ajuste
DocType: Packing Slip,Get Items,Obtener Artículos
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Please enter Write Off Account,Por favor introduce Escriba Off Cuenta
-DocType: DocField,Image,imagen
+DocType: DocField,Image,Imagen
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +220,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Hacer Lista de Empaque
DocType: Communication,Other,Otro
DocType: C-Form,C-Form,C - Forma
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,ID Operación no establece
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,ID de Operación no definido
DocType: Production Order,Planned Start Date,Fecha de inicio prevista
DocType: Serial No,Creation Document Type,Tipo de creación de documentos
DocType: Leave Type,Is Encash,Se convertirá en efectivo
@@ -2944,7 +2944,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Continuous casting,La colada continua
sites/assets/js/erpnext.min.js +6,Please specify a,"Por favor, especifique un"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Hacer factura de compra
-DocType: Offer Letter,Awaiting Response,Espera de la respuesta
+DocType: Offer Letter,Awaiting Response,Esperando la Respuesta
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Cold sizing,Dimensionamiento Fría
DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
@@ -3008,7 +3008,7 @@
apps/erpnext/erpnext/stock/get_item_details.py +108,No Item with Serial No {0},Ningún artículo con Serial No {0}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos Directos
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +645,Do you really want to UNSTOP this Material Request?,¿De verdad quiere destapar esta demanda de materiales?
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos del nuevo Cliente
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos por Nuevo Cliente
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
DocType: Maintenance Visit,Breakdown,Desglose
DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque
@@ -3068,7 +3068,7 @@
DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,Secretario
DocType: Serial No,Distinct unit of an Item,Unidad distinta de un artículo
-apps/erpnext/erpnext/config/setup.py +96,Item master.,Maestro de artículos .
+apps/erpnext/erpnext/config/setup.py +96,Item master.,Maestro de Artículos .
DocType: Pricing Rule,Buying,Compra
DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este Grupo de Horas Registradas se ha facturado.
@@ -3188,13 +3188,13 @@
DocType: Sales Partner,Partner's Website,Sitio Web del Socio
DocType: Opportunity,To Discuss,Para Discusión
DocType: SMS Settings,SMS Settings,Ajustes de SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas temporales
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas Temporales
DocType: Payment Tool,Column Break 1,Columna Pausa 1
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Negro
DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Artículo
DocType: Account,Auditor,Auditor
DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hacer una Oferta Carta
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hacer una Carta de Oferta
DocType: DocField,Fold,Plegar
DocType: Production Order Operation,Production Order Operation,Orden de Producción Operación
DocType: Pricing Rule,Disable,Inhabilitar
@@ -3258,7 +3258,7 @@
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","Contra Tipo de Comprobante debe ser uno de Orden de Compra, Factura de Compra o Comprobante de Diario"
DocType: Account,Stock Adjustment,Ajuste de existencias
DocType: Production Order,Planned Operating Cost,Planeado Costo de funcionamiento
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Nueva {0} Nombre
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Nuevo {0} Nombre
apps/erpnext/erpnext/controllers/recurring_document.py +126,Please find attached {0} #{1},Encuentre {0} # adjunto {1}
DocType: Global Defaults,jsonrates.com API Key,jsonrates.com Clave API
DocType: Job Applicant,Applicant Name,Nombre del Solicitante
@@ -3282,7 +3282,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,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.
DocType: Company,Distribution,Distribución
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,Gerente de Proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,despacho
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,Despacho
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
DocType: Account,Receivable,Cuenta por Cobrar
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 .
@@ -3377,7 +3377,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
DocType: Communication,Email,Correo Electronico
-DocType: Item Group,Item Classification,Clasificación de artículos
+DocType: Item Group,Item Classification,Clasificación de Artículos
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Gerente de Desarrollo de Negocios
DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
@@ -3449,7 +3449,7 @@
DocType: ToDo,Priority,Prioridad
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +168,"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","No se puede eliminar Nº de Serie {0} en inventario . Primero elimine del inventario, y a continuación elimine ."
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Quitar elemento si los cargos no son aplicables a dicho elemento
-DocType: Backup Manager,Dropbox Access Allowed,Dropbox Acceso mascotas
+DocType: Backup Manager,Dropbox Access Allowed,Acceso a Dropbox Permitido
DocType: Backup Manager,Weekly,Semanal
DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
DocType: Maintenance Visit,Fully Completed,totalmente Terminado
@@ -3559,7 +3559,7 @@
DocType: User,Enabled,Habilitado
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
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},¿De verdad quieres a que me envíen toda la nómina para el mes {0} y {1} años
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Los suscriptores de importación
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar Suscriptores
DocType: Target Detail,Target Qty,Cantidad Objetivo
DocType: Attendance,Present,Presente
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
@@ -3635,7 +3635,7 @@
DocType: Task,Closing Date,Fecha de Cierre
DocType: Sales Order Item,Produced Quantity,Cantidad producida
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +79,Engineer,Ingeniero
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Código del artículo requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Código del Artículo requerido en la Fila No {0}
DocType: Sales Partner,Partner Type,Tipo de Socio
DocType: Purchase Taxes and Charges,Actual,Real
DocType: Purchase Order,% of materials received against this Purchase Order,% Del material recibido en contra de esta Orden de Compra
@@ -3707,7 +3707,7 @@
DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Cuenta de Pago
DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
DocType: Item,Default Warehouse,Almacén por Defecto
-DocType: Task,Actual End Date (via Time Logs),Actual Fecha de finalización (a través de los registros de tiempo)
+DocType: Task,Actual End Date (via Time Logs),Fecha actual de finalización (via Registros Temporales)
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,"Por favor, introduzca el centro de coste de los padres"
DocType: Delivery Note,Print Without Amount,Imprimir sin Importe
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,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
@@ -3761,7 +3761,7 @@
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 .
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,De Oportunidades
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficios a los empleados
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficios a los Empleados
DocType: Sales Invoice,Is POS,Es POS
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +224,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elmento {0} en la fila {1}
DocType: Production Order,Manufactured Qty,Cantidad Fabricada
@@ -3770,7 +3770,7 @@
DocType: DocField,Default,Defecto
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificación del proyecto
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Al seleccionar "" Sí"" permitirá que este tema aparezca en la Orden de Compra , recibo de compra ."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonados añadirse
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonados añadidos
DocType: Maintenance Schedule,Schedule,Horario
DocType: Account,Parent Account,Cuenta Primaria
DocType: Serial No,Available,Disponible
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index d1802b9..674b230 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -77,10 +77,10 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,نجاری
DocType: Production Order Operation,Work In Progress,کار در حال انجام
DocType: Company,If Monthly Budget Exceeded,اگر بودجه ماهانه فراتر از
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,چاپ 3D
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,چاپ سه بعدی
DocType: Employee,Holiday List,فهرست تعطیلات
DocType: Time Log,Time Log,زمان ورود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,محاسب
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,حسابدار
DocType: Company,Phone No,تلفن
DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",ورود از فعالیت های انجام شده توسط کاربران در برابر وظایف است که می تواند برای ردیابی زمان، صدور صورت حساب استفاده می شود.
apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},جدید {0}: # {1}
@@ -116,17 +116,17 @@
DocType: POS Setting,Write Off Cost Center,ارسال فعال مرکز هزینه
DocType: Warehouse,Warehouse Detail,جزئیات انبار
apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {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},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {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,پدر و مادر مورد {0} باید مورد سهام نمی شود و باید مورد فروش می شود
DocType: Item,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
DocType: SMS Log,SMS Log,SMS ورود
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
DocType: Blog Post,Guest,مهمان
DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,بیل از مواد
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,صورت مواد
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},از {0} به {1}
DocType: Item,Copy From Item Group,کپی برداری از مورد گروه
DocType: Journal Entry,Opening Entry,ورود افتتاح
@@ -162,7 +162,7 @@
DocType: Newsletter,Email Sent?,ایمیل فرستاده شده است؟
DocType: Journal Entry,Contra Entry,کنترا ورود
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,نمایش زمان گزارش ها
-DocType: Email Digest,Bank/Cash Balance,بانک / نقدی تعادل
+DocType: Email Digest,Bank/Cash Balance,موجودی بانک / نقدی
DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
DocType: Item,Supply Raw Materials for Purchase,عرضه مواد اولیه برای خرید
@@ -186,7 +186,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +135,Execution,اعدام
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,The first user will become the System Manager (you can change this later).,اولین کاربر تبدیل خواهد شد مدیر سیستم (شما می توانید این تنظیمات را تغییر دهید).
apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,جزئیات عملیات انجام شده است.
-DocType: Serial No,Maintenance Status,نگهداری وضعیت
+DocType: Serial No,Maintenance Status,وضعیت نگهداری
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,کارمند برای آنها ایجاد می کنید ارزیابی انتخاب کنید.
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +90,Cost Center {0} does not belong to Company {1},هزینه مرکز {0} به شرکت تعلق ندارد {1}
@@ -320,7 +320,7 @@
DocType: Communication,Support Manager,مدیر پشتیبانی
DocType: Sales Order Item,Reserved Warehouse,انبار محفوظ است
apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دو بار در مالیات مورد وارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
DocType: Workstation,Rent Cost,اجاره هزینه
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,لطفا ماه و سال را انتخاب کنید
DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",را وارد کنید ایمیل ID با کاما جدا شده، فاکتور به صورت خودکار در تاریخ خاص فرستاده
@@ -336,7 +336,7 @@
DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",موجود در BOM، تحویل توجه داشته باشید، خرید فاکتور، سفارش تولید، سفارش خرید، رسید خرید، فاکتور فروش، سفارش فروش، انبار ورودی، برنامه زمانی
DocType: Item Tax,Tax Rate,نرخ مالیات
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,انتخاب مورد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} وضعیت متوقف
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} وضعیت متوقف شده است
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
Stock Reconciliation, instead use Stock Entry",مورد: {0} موفق دسته ای و زرنگ، نمی تواند با استفاده از \ سهام آشتی، به جای استفاده از بورس ورود آشتی
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +242,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
@@ -379,7 +379,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,لطفا رسید خرید بدون وارد ادامه
DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
DocType: Workstation,Consumable Cost,هزینه مصرفی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید نقش داشته مرخصی تصویب '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,پزشکی
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,دلیل برای از دست دادن
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,خم کن کاغذ لوله
@@ -415,7 +415,7 @@
apps/erpnext/erpnext/config/hr.py +140,Holiday master.,کارشناسی ارشد تعطیلات.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Shell molding,قالب ریزی و سازه پوسته
DocType: Material Request Item,Required Date,تاریخ مورد نیاز
-DocType: Delivery Note,Billing Address,آدرس قبض
+DocType: Delivery Note,Billing Address,نشانی صورتحساب
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,لطفا کد مورد را وارد کنید.
DocType: BOM,Costing,هزینه یابی
DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
@@ -428,7 +428,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,باند
DocType: Job Opening,Description of a Job Opening,شرح یک شغل
apps/erpnext/erpnext/config/hr.py +28,Attendance record.,ثبت حضور و غیاب.
-DocType: Bank Reconciliation,Journal Entries,مطالب مجله
+DocType: Bank Reconciliation,Journal Entries,ورودی های دفتر روزنامه
DocType: Sales Order Item,Used for Production Plan,مورد استفاده برای طرح تولید
DocType: System Settings,Loading...,در حال بارگذاری ...
DocType: DocField,Password,رمز عبور
@@ -436,9 +436,9 @@
DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.",توجه: پشتیبان گیری و فایل ها از Google Drive حذف نیست، شما باید به صورت دستی آنها را حذف کنید.
DocType: Customer,Buyer of Goods and Services.,خریدار کالا و خدمات.
-DocType: Journal Entry,Accounts Payable,حساب های قابل پرداخت
+DocType: Journal Entry,Accounts Payable,حساب های پرداختنی
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,اضافه کردن مشترکین
-sites/assets/js/erpnext.min.js +2,""" does not exists","به این وجود دارد نمی
+sites/assets/js/erpnext.min.js +2,""" does not exists",وجود ندارد
DocType: Pricing Rule,Valid Upto,معتبر تا حد
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
DocType: Email Digest,Open Tickets,بلیط گسترش
@@ -481,7 +481,7 @@
apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
Email Address'",{0} آدرس ایمیل نامعتبر در 'هشدار از طریق \ آدرس ایمیل' است
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,حسابداری مجموع این سال:
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,اضافه کردن مالیات / ویرایش و اتهامات
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
DocType: Territory,For reference,برای مرجع
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),بسته شدن (کروم)
@@ -532,13 +532,13 @@
DocType: Event,Wednesday,چهار شنبه
DocType: Sales Invoice,Customer's Vendor,فروشنده مشتری
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +197,Production Order is Mandatory,سفارش تولید الزامی است
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +40,{0} {1} has a common territory {2},{0} {1} دارای یک قلمرو مشترک {2}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +40,{0} {1} has a common territory {2},{0} {1} دارای یک ناحیه مشترک {2}
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Proposal Writing,نوشتن طرح های پیشنهادی
apps/erpnext/erpnext/config/setup.py +85,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},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
DocType: Packing Slip Item,DN Detail,جزئیات DN
-DocType: Time Log,Billed,ثبت شده در صورتحساب یا لیست
+DocType: Time Log,Billed,فاکتور شده
DocType: Batch,Batch Description,دسته توضیحات
DocType: Delivery Note,Time at which items were delivered from warehouse,زمانی که در آن اقلام از انبار تحویل داده شد
DocType: Sales Invoice,Sales Taxes and Charges,مالیات فروش و اتهامات
@@ -548,7 +548,7 @@
DocType: Employee,Reason for Resignation,دلیل استعفای
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,الگو برای ارزیابی عملکرد.
DocType: Payment Reconciliation,Invoice/Journal Entry Details,فاکتور / مجله ورود به جزئیات
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' در سال مالی {2}
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' در سال مالی شماره {2} وجود ندارد
DocType: Buying Settings,Settings for Buying Module,تنظیمات برای خرید ماژول
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,لطفا ابتدا وارد رسید خرید
DocType: Buying Settings,Supplier Naming By,تامین کننده نامگذاری توسط
@@ -560,7 +560,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,از رسید خرید
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,بر اساس "و" گروه توسط "نمی تواند به همان
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
DocType: Sales Person,Sales Person Targets,اهداف فرد از فروش
sites/assets/js/form.min.js +253,To,برای
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,لطفا آدرس ایمیل را وارد کنید
@@ -592,13 +592,13 @@
DocType: Purchase Invoice,Write Off Amount,ارسال فعال مقدار
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Bending,خم
DocType: Leave Block List Allow,Allow User,اجازه می دهد کاربر
-DocType: Journal Entry,Bill No,بیل بدون
+DocType: Journal Entry,Bill No,شماره صورتحساب
DocType: Purchase Invoice,Quarterly,فصلنامه
DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
DocType: Sales Order Item,Basic Rate (Company Currency),نرخ پایه (شرکت ارز)
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,لطفا جزئیات آیتم را وارد کنید
DocType: Purchase Receipt,Other Details,سایر مشخصات
-DocType: Account,Accounts,حساب
+DocType: Account,Accounts,حسابها
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,بازار یابی
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Straight shearing,قیچی و برش مستقیم
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.,برای پیگیری آیتم در فروش و خرید اسناد بر اساس NOS سریال خود را. این هم می تواند برای پیگیری جزئیات ضمانت محصول استفاده می شود.
@@ -634,7 +634,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} است مورد سهام نمی
DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
-DocType: Contact Us Settings,Address Title,آدرس عنوان
+DocType: Contact Us Settings,Address Title,عنوان نشانی
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +32,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
@@ -658,7 +658,7 @@
DocType: ToDo,High,زیاد
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +364,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
DocType: Opportunity,Maintenance,نگهداری
-DocType: User,Male,نر
+DocType: User,Male,مرد
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
apps/erpnext/erpnext/config/crm.py +54,Sales campaigns.,کمپین فروش.
@@ -683,7 +683,7 @@
8. 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).
9. 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.",قالب مالیاتی استاندارد است که می تواند به تمام معاملات فروش اعمال می شود. این الگو می تواند شامل لیستی از سر مالیات و همچنین دیگر سر هزینه / درآمد مانند "حمل و نقل"، "بیمه"، "سیستم های انتقال مواد" و غیره #### توجه داشته باشید نرخ مالیات در اینجا تعریف می کنید خواهد بود که نرخ مالیات استاندارد برای همه ** آیتم ها **. اگر تعداد آیتم ها ** ** که نرخ های مختلف وجود دارد، آنها باید در مورد مالیات ** ** جدول اضافه می شود در مورد ** ** استاد. #### شرح ستون 1. نوع محاسبه: - این می تواند بر روی ** ** خالص مجموع باشد (که مجموع مبلغ پایه است). - ** در انتظار قبلی مجموع / مقدار ** (برای مالیات تجمعی و یا اتهامات عنوان شده علیه). اگر شما این گزینه را انتخاب کنید، مالیات به عنوان یک درصد از سطر قبلی (در جدول مالیاتی) و یا مقدار کل اعمال می شود. - ** ** واقعی (به عنوان ذکر شده). 2. حساب سر: دفتر حساب که تحت آن این مالیات خواهد شد رزرو 3. مرکز هزینه: اگر مالیات / هزینه درآمد (مانند حمل و نقل) است و یا هزینه آن نیاز دارد تا در برابر یک مرکز هزینه رزرو شود. 4. توضیحات: توضیحات از مالیات (که در فاکتورها / به نقل از چاپ). 5. نرخ: نرخ مالیات. 6. مقدار: مبلغ مالیات. 7. مجموع: مجموع تجمعی به این نقطه است. 8. ردیف را وارد کنید: اگر بر اساس "سطر قبلی مجموع" شما می توانید تعداد ردیف خواهد شد که به عنوان پایه ای برای این محاسبه (به طور پیش فرض سطر قبلی است) گرفته شده را انتخاب کنید. 9. آیا این مالیات شامل در نرخ پایه ؟: اگر شما این را بررسی کنید، به این معنی که این مالیات خواهد شد جدول زیر نشان داده شده مورد نیست، اما خواهد شد در نرخ پایه در جدول آیتم های اصلی خود را گنجانده شده است. این بسیار مفید است که در آن شما می خواهید را قیمت تخت (شامل تمام مالیات) قیمت به مشتریان.
DocType: Serial No,Purchase Returned,خرید برگشتی
-DocType: Employee,Bank A/C No.,شماره بانک A / C
+DocType: Employee,Bank A/C No.,شماره حساب بانک
DocType: Email Digest,Scheduler Failed Events,زمانبند شکست خورد رویدادها
DocType: Expense Claim,Project,پروژه
DocType: Quality Inspection Reading,Reading 7,خواندن 7
@@ -705,7 +705,7 @@
DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,شماره
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات بانک آشتی
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,فاکتورها من
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,بدون کارمند یافت
DocType: Purchase Order,Stopped,متوقف
@@ -721,7 +721,7 @@
apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,نمایش داده شد پشتیبانی از مشتریان.
DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} در برابر بیل {1} تاریخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
DocType: Communication,Reference Name,نام مرجع
DocType: Maintenance Visit,Completion 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",برای پیگیری نام تجاری در مدارک زیر را تحویل توجه داشته باشید، فرصت، درخواست مواد، مورد، سفارش خرید، خرید کوپن، دریافت مشتری، نقل قول، فاکتور فروش، فروش BOM، سفارش فروش، سریال بدون
@@ -745,7 +745,7 @@
,Amount to Bill,مقدار به بیل
DocType: Company,Registration Details,جزییات ثبت نام
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,پوست بزرگ هستند
-DocType: Item Reorder,Re-Order Qty,ترتیب تعداد
+DocType: Item Reorder,Re-Order Qty,تعداد نقطه سفارش
DocType: Leave Block List Date,Leave Block List Date,ترک فهرست بلوک عضویت
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +23,Scheduled to send to {0},برنامه ریزی برای ارسال به {0}
DocType: Pricing Rule,Price or Discount,قیمت و یا تخفیف
@@ -755,7 +755,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +636,Make Maint. Visit,سیستم maint را. بازدید
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +68,Cannot carry forward {0},نمی تواند حمل به جلو {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'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه "تعادل باید" را بعنوان "اعتباری"
-DocType: Account,Balance must be,تعادل باید
+DocType: Account,Balance must be,موجودی باید
DocType: Hub Settings,Publish Pricing,قیمت گذاری انتشار
DocType: Email Digest,New Purchase Receipts,رسید خرید جدید
DocType: Notification Control,Expense Claim Rejected Message,پیام ادعای هزینه رد
@@ -791,7 +791,7 @@
DocType: Bank Reconciliation,Total Amount,مقدار کل
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Internet Publishing,انتشارات اینترنت
DocType: Production Planning Tool,Production Orders,سفارشات تولید
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,ارزش تعادل
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,ارزش موجودی
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,فهرست قیمت فروش
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,انتشار همگام موارد
DocType: Purchase Receipt,Range,محدوده
@@ -865,11 +865,11 @@
DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هزینه فرود رسید خرید
DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
-DocType: POS Setting,Cash/Bank Account,نقدی / حساب بانکی
+DocType: POS Setting,Cash/Bank Account,نقد / حساب بانکی
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
DocType: Delivery Note,Delivery To,تحویل به
DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تونه منفی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,"Row {0}: Party / Account does not match with \
Customer / Debit To in {1}",ردیف {0}: حزب / حساب می کند با \ مشتری / اعتباری به در مطابقت ندارد {1}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Filing,بایگانی
@@ -896,7 +896,7 @@
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,فروش مقدار
apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,زمان ثبت
-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,شما تصویب هزینه برای این سابقه بوده است. لطفا "وضعیت و ذخیره به روز رسانی
+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,شما تصویبکننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
DocType: Serial No,Creation Document No,ایجاد سند بدون
DocType: Issue,Issue,موضوع
apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
@@ -935,13 +935,13 @@
DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
DocType: Contact Us Settings,Address,نشانی
DocType: Expense Claim,From Employee,از کارمند
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} در هر سال مالی. برای جزئیات بیشتر {2}.
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} در هیچ سال مالی وجود ندارد. برای جزئیات بیشتر {2}.
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
-DocType: Appraisal Template Goal,Key Performance Area,کلید عملکرد منطقه
+DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,حمل و نقل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} باید قطعی شود
DocType: SMS Center,Total Characters,مجموع شخصیت
apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
DocType: C-Form Invoice Detail,C-Form Invoice Detail,جزئیات C-فرم فاکتور
@@ -968,7 +968,7 @@
DocType: Salary Slip,Earnings,درامد
DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,هیچ چیز برای درخواست
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','واقعی تاریخ شروع نمی تواند بیشتر از' پایان واقعی تاریخ '
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,اداره
apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,نوع فعالیت برای ورق های زمان
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,ریخته گری سرمایه گذاری
@@ -1025,7 +1025,7 @@
DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,بقیه دنیا
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
-,Budget Variance Report,بودجه واریانس گزارش
+,Budget Variance Report,گزارش انحراف از بودجه
DocType: Salary Slip,Gross Pay,پرداخت ناخالص
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,سود سهام پرداخت
DocType: Stock Reconciliation,Difference Amount,مقدار تفاوت
@@ -1042,14 +1042,14 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,افتتاح موقت
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
,Employee Leave Balance,کارمند مرخصی تعادل
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},تعادل برای حساب {0} همیشه باید {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
DocType: Sales Invoice,More Info,اطلاعات بیشتر
-DocType: Address,Address Type,آدرس نوع
+DocType: Address,Address Type,نوع نشانی
DocType: Purchase Receipt,Rejected Warehouse,انبار را رد کرد
DocType: GL Entry,Against Voucher,علیه کوپن
DocType: Item,Default Buying Cost Center,به طور پیش فرض مرکز هزینه خرید
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,مورد {0} باید مورد فروش می شود
-,Accounts Payable Summary,حساب خلاصه پرداختنی
+,Accounts Payable Summary,خلاصه حسابهای پرداختنی
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
@@ -1104,7 +1104,7 @@
DocType: Purchase Invoice,Total (Company Currency),مجموع (شرکت ارز)
DocType: Applicable Territory,Applicable Territory,سرزمین قابل اجرا
apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,شماره سریال {0} وارد بیش از یک بار
-DocType: Journal Entry,Journal Entry,مجله ورودی
+DocType: Journal Entry,Journal Entry,ورودی دفتر
DocType: Workstation,Workstation Name,نام ایستگاه های کاری
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,ایمیل خلاصه:
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
@@ -1145,7 +1145,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +99,Status updated to {0},وضعیت به روز شده برای {0}
DocType: DocField,Description,شرح
DocType: Authorization Rule,Average Discount,میانگین تخفیف
-DocType: Backup Manager,Backup Manager,مدیریت پشتیبانی
+DocType: Backup Manager,Backup Manager,مدیریت پشتیبان گیری
DocType: Letter Head,Is Default,آیا پیش فرض
DocType: Address,Utilities,نرم افزار
DocType: Purchase Invoice Item,Accounting,حسابداری
@@ -1166,7 +1166,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید "تایید" یا "رد"
DocType: Sales Invoice,Sales BOM Help,BOM فروش راهنما
DocType: Purchase Invoice,Contact Person,شخص تماس
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date','انتظار تاریخ شروع' می تواند بیشتر از 'انتظار پایان تاریخ "نمی
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"'تاریخ شروع پیش بینی شده' نمی تواند بیشتر از 'تاریخ پایان پیش بینی شده"" باشد"
DocType: Holiday List,Holidays,تعطیلات
DocType: Sales Order Item,Planned Quantity,تعداد برنامه ریزی شده
DocType: Purchase Invoice Item,Item Tax Amount,مبلغ مالیات مورد
@@ -1179,7 +1179,7 @@
apps/erpnext/erpnext/config/support.py +38,Communication log.,ورود به سیستم ارتباطات.
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,مقدار خرید
DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,نمودار حساب
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ساختار حسابها
DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +506,cannot be greater than 100,نمی تواند بیشتر از 100
DocType: Purchase Receipt Item,Discount %,تخفیف٪
@@ -1270,7 +1270,7 @@
DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
DocType: Event,Tuesday,سهشنبه
DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
-,Accounts Receivable Summary,حساب خلاصه دریافتنی
+,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
DocType: UOM,UOM Name,نام UOM
DocType: Top Bar Item,Target,هدف
@@ -1291,7 +1291,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Notching,اهمیت حیاتی
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +44,Reserved warehouse required for stock item {0},انبار محفوظ است مورد نیاز برای سهام مورد {0}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,حساب های بانکی
-,Bank Reconciliation Statement,بیانیه بانک آشتی
+,Bank Reconciliation Statement,صورتحساب مغایرت گیری بانک
DocType: Address,Lead Name,نام سرب
,POS,POS
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0} باید تنها یک بار به نظر می رسد
@@ -1331,12 +1331,12 @@
DocType: Email Digest,Expenses Booked,هزینه رزرو
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +168,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
DocType: Quotation Item,Quotation Item,مورد نقل قول
-DocType: Account,Account Name,نام کاربری
+DocType: Account,Account Name,نام حساب
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} quantity {1} cannot be a fraction,سریال بدون {0} مقدار {1} می تواند یک بخش نمی
apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,نوع منبع کارشناسی ارشد.
DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,اضافه کردن
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,افزودن
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
DocType: Accounts Settings,Credit Controller,کنترل اعتبار
DocType: Delivery Note,Vehicle Dispatch Date,اعزام خودرو تاریخ
@@ -1410,7 +1410,7 @@
DocType: Item,Weightage,بین وزنها
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Mining,استخراج معدن
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Resin casting,ریخته گری رزین
-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,مشتری گروه با همین نام وجود دارد لطفا نام مشتری تغییر و یا تغییر نام گروه به مشتری
+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,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
DocType: Territory,Parent Territory,سرزمین پدر و مادر
DocType: Quality Inspection Reading,Reading 2,خواندن 2
DocType: Stock Entry,Material Receipt,دریافت مواد
@@ -1455,11 +1455,11 @@
DocType: Sales Invoice Item,Warehouse and Reference,انبار و مرجع
DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
DocType: Country,Country,کشور
-apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,آدرس
+apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,نشانی ها
DocType: Communication,Received,رسیده
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرایط برای حکومت حمل و نقل
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
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",نام حساب جدید. توجه: لطفا برای حساب های مشتریان و تامین کنندگان ایجاد نمی کنند، آنها به طور خودکار از مشتری و تامین کننده اصلی ایجاد
DocType: DocField,Attach Image,ضمیمه تصویر
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص از اقلام محاسبه)
@@ -1475,7 +1475,7 @@
DocType: Offer Letter,Rejected,رد
DocType: Pricing Rule,Brand,مارک
DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,٪ تحویل
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,٪ تحویل شده
apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,موارد نرم افزاری در زمان فروش.
DocType: Sales Order Item,Actual Qty,تعداد واقعی
DocType: Quality Inspection Reading,Reading 10,خواندن 10
@@ -1534,14 +1534,14 @@
DocType: Item,Is Sales Item,آیا مورد فروش
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,مورد گروه درخت
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
-DocType: Maintenance Visit,Maintenance Time,نگهداری زمان
+DocType: Maintenance Visit,Maintenance Time,زمان نگهداری
,Amount to Deliver,مقدار برای ارائه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,یک محصول یا خدمات
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,یک محصول یا خدمت
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,خطاهایی وجود دارد.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,بهره برداری
DocType: Naming Series,Current Value,ارزش فعلی
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},مورد الگو می تواند سهام و varaiants ندارد. لطفا سهام را از انبارها {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} ایجاد شد
DocType: Journal Entry Account,Against Sales Order,علیه سفارش فروش
,Serial No Status,سریال نیست
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,جدول مورد نمیتواند خالی باشد
@@ -1593,14 +1593,14 @@
DocType: Communication,Date,تاریخ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار درآمد و ضوابط
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.,سفت و سخت در حالی که سیستم شما در حال راه اندازی. این ممکن است چند لحظه طول بکشد.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید نقش 'تصویب هزینه' دارند
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,جفت
DocType: Bank Reconciliation Detail,Against Account,به حساب
DocType: Maintenance Schedule Detail,Actual Date,تاریخ واقعی
DocType: Item,Has Batch No,دارای دسته ای بدون
DocType: Delivery Note,Excise Page Number,مالیات کالاهای داخلی صفحه شماره
DocType: Employee,Personal Details,اطلاعات شخصی
-,Maintenance Schedules,برنامه نگهداری و تعمیرات
+,Maintenance Schedules,برنامه های نگهداری و تعمیرات
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Embossing,ختم
,Quotation Trends,روند نقل قول
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
@@ -1608,7 +1608,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",عنوان سفارش تولید می توان برای این آیتم به ساخته شده، آن را باید یک مورد سهام باشد.
DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,پیوستن
-DocType: Authorization Rule,Above Value,بالا ارزش
+DocType: Authorization Rule,Above Value,بالاتر از ارزش
,Pending Amount,در انتظار مقدار
DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
DocType: Serial No,Delivered,تحویل
@@ -1664,7 +1664,7 @@
DocType: Opportunity,Quotation,نقل قول
DocType: Salary Slip,Total Deduction,کسر مجموع
apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,هی! برو جلو و اضافه کردن یک آدرس
-DocType: Quotation,Maintenance User,نگهداری کاربر
+DocType: Quotation,Maintenance User,کاربر نگهداری
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,هزینه به روز رسانی
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,آیا مطمئن هستید که می خواهید به UNSTOP
DocType: Employee,Date of Birth,تاریخ تولد
@@ -1703,7 +1703,7 @@
apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
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",نمی تواند برای مورد {0} در ردیف overbill {1} بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
DocType: Employee,Bank Name,نام بانک
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-بالا
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,کاربر {0} غیر فعال است
DocType: Leave Application,Total Leave Days,مجموع مرخصی روز
DocType: Email Digest,Note: Email will not be sent to disabled users,توجه: ایمیل را به کاربران غیر فعال شده ارسال نمی شود
@@ -1738,7 +1738,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
DocType: Account,Fixed Asset,دارائی های ثابت
DocType: Time Log Batch,Total Billing Amount,کل مقدار حسابداری
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,دریافتنی حساب
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب دریافتنی
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +140,No Updates For,بدون به روز رسانی برای
,Stock Balance,تعادل سهام
DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
@@ -1874,7 +1874,7 @@
DocType: Appraisal,Employee,کارمند
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,واردات از ایمیل
DocType: Features Setup,After Sale Installations,پس از نصب فروش
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
DocType: Workstation Working Hour,End Time,پایان زمان
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شرایط قرارداد استاندارد برای فروش و یا خرید.
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,گروه های کوپن
@@ -1893,11 +1893,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +108,Pharmaceutical,دارویی
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,هزینه اقلام خریداری شده
DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد و ضوابط
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد مشتری
DocType: Purchase Invoice,Credit To,اعتبار به
DocType: Employee Education,Post Graduate,فوق لیسانس
DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.",توجه: پشتیبان گیری و فایل ها از Dropbox حذف نیست، شما باید به صورت دستی آنها را حذف کنید.
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,برنامه نگهداری و تعمیرات جزئیات
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,جزئیات برنامه نگهداری و تعمیرات
DocType: Quality Inspection Reading,Reading 9,خواندن 9
DocType: Buying Settings,Buying Settings,تنظیمات خرید
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,به پایان رساندن توده
@@ -1924,7 +1924,7 @@
DocType: Employee,Previous Work Experience,قبلی سابقه کار
DocType: Stock Entry,For Quantity,برای کمیت
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} ثبت نشده است
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,درخواست ها برای اقلام است.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
DocType: Email Digest,New Communications,ارتباطات جدید
@@ -1952,7 +1952,7 @@
DocType: Purchase Receipt,Get Current Stock,دریافت سهام کنونی
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,نصب و راه اندازی را توجه داشته باشید
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
-DocType: Production Order,Actual End Date,واقعی پایان تاریخ
+DocType: Production Order,Actual End Date,تاریخ واقعی پایان
DocType: Authorization Rule,Applicable To (Role),به قابل اجرا (نقش)
DocType: Stock Entry,Purpose,هدف
DocType: Item,Will also apply for variants unless overrridden,همچنین برای انواع اعمال می شود مگر اینکه overrridden
@@ -2028,7 +2028,7 @@
DocType: Purchase Invoice,Will be calculated automatically when you enter the details,خواهد شد به صورت خودکار محاسبه زمانی که شما وارد جزئیات
DocType: Delivery Note,Transporter lorry number,تعداد کامیون حمل و نقل
DocType: Sales Order,Billing Status,حسابداری وضعیت
-DocType: Backup Manager,Backup Right Now,پشتیبان گیری در حال حاضر
+DocType: Backup Manager,Backup Right Now,هم اکنون یک پشتیبان بگیر
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,هزینه آب و برق
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-بالاتر از
DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
@@ -2045,7 +2045,7 @@
DocType: Item,Quality Parameters,پارامترهای کیفیت
DocType: Target Detail,Target Amount,هدف مقدار
DocType: Shopping Cart Settings,Shopping Cart Settings,تنظیمات سبد خرید
-DocType: Journal Entry,Accounting Entries,مطالب حسابداری
+DocType: Journal Entry,Accounting Entries,ثبت های حسابداری
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},تکراری ورودی. لطفا بررسی کنید مجوز قانون {0}
DocType: Purchase Order,Ref SQ,SQ کد عکس
apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,جایگزین مورد / BOM در تمام BOMs
@@ -2062,7 +2062,7 @@
DocType: Party Type,Parent Party Type,پدر و مادر نوع حزب
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Cutting,برش
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flattening,تنظیمات کوپن
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,پشتیبان گیری خواهد شد به آپلود
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,پشتیبان تهیه شده آپلود خواند شد در
DocType: Account,Income Account,حساب درآمد
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,قالب ریزی
DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
@@ -2104,7 +2104,7 @@
apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},وضعیت باید یکی از است {0}
DocType: Sales Invoice,Debit To,بدهی به
DocType: Delivery Note,Required only for sample item.,فقط برای نمونه مورد نیاز است.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از معامله
+DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,خیلی بزرگ
,Profit and Loss Statement,بیانیه سود و زیان
@@ -2161,14 +2161,14 @@
1. Address and Contact of your Company.",شرایط و ضوابط استاندارد است که می تواند به خرید و فروش اضافه شده است. مثال: 1. اعتبار ارائه دهد. 1. شرایط پرداخت (در پیش است، در اعتبار، بخشی از پیش و غیره). 1. چه اضافی (یا قابل پرداخت توسط مشتری) می باشد. 1. ایمنی هشدار / استفاده. 1. گارانتی در صورت وجود. 1. بازگرداندن سیاست. 1. شرایط حمل و نقل، اگر قابل اجرا است. 1. راه های مقابله با اختلافات، غرامت، مسئولیت، و غیره 1. آدرس و تماس با شرکت شما.
DocType: Attendance,Leave Type,نوع مرخصی
apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری '، سود و ضرر باشد
-DocType: Account,Accounts User,حساب کاربری
+DocType: Account,Accounts User,کاربر حسابها
DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",بررسی کنید که تکرار فاکتور، تیک برای جلوگیری از تکرار و یا قرار دادن پایان مناسب عضویت
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,حداکثر {0} ردیف اجازه
DocType: C-Form Invoice Detail,Net Total,مجموع خالص
DocType: Bin,FCFS Rate,FCFS نرخ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),حسابداری (فاکتور فروش)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),صورت حساب (فاکتور فروش)
DocType: Payment Reconciliation Invoice,Outstanding Amount,مقدار برجسته
DocType: Project Task,Working,کار
DocType: Stock Ledger Entry,Stock Queue (FIFO),سهام صف (FIFO)
@@ -2207,7 +2207,7 @@
DocType: Purchase Invoice,Half-yearly,نیمه سال
apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,سال مالی {0} یافت نشد.
DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرتبط
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,ثبت حسابداری برای سهام
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,ثبت حسابداری برای انبار
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,ضرب
DocType: Sales Invoice,Sales Team1,Team1 فروش
apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,مورد {0} وجود ندارد
@@ -2289,7 +2289,7 @@
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,سریال بدون {0} وضعیت باید در دسترس به تحویل می شود
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت "تایید" را می توان ارائه بگذارید
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,آدرس عنوان الزامی است.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,عنوان نشانی الزامی است.
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,روزنامه
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
@@ -2320,7 +2320,7 @@
DocType: Leave Control Panel,Employee Type,نوع کارمند
DocType: Employee Leave Approver,Leave Approver,ترک تصویب
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,سنبه کاری
-DocType: Expense Claim,"A user with ""Expense Approver"" role",کاربر با نقش "هزینه تصویب"
+DocType: Expense Claim,"A user with ""Expense Approver"" role","یک کاربر با نقشه ""تایید کننده هزینه ها"""
,Issued Items Against Production Order,آیتم صادره علیه سفارش تولید
DocType: Pricing Rule,Purchase Manager,مدیر خرید
DocType: Payment Tool,Payment Tool,ابزار پرداخت
@@ -2382,8 +2382,8 @@
DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
DocType: Employee Education,School/University,مدرسه / دانشگاه
DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
-,Billed Amount,مقدار ثبت شده در صورتحساب
-DocType: Bank Reconciliation,Bank Reconciliation,بانک آشتی
+,Billed Amount,مقدار فاکتور شده
+DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
DocType: Purchase Invoice,Total Amount To Pay,مقدار کل به پرداخت
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
DocType: Event,Groups,گروه
@@ -2398,7 +2398,7 @@
apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
DocType: Leave Allocation,Carry Forwarded Leaves,برگ فرستاده حمل
-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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
,Stock Projected Qty,سهام بینی تعداد
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
DocType: Warranty Claim,From Company,از شرکت
@@ -2415,13 +2415,13 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
-DocType: Sales Order,% Delivered,٪ تحویل
+DocType: Sales Order,% Delivered,٪ تحویل شده
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,بانک حساب چک بی محل
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,را لغزش حقوق
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Unstop
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,وام
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,نادیده گرفته:
-apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} نمی تواند با استفاده از سبد خرید خریداری شود
+apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} نمی تواند با استفاده از کارت خرید، خریداری شود
apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,محصولات عالی
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance 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,آیا می توانم مرخصی را تایید نمی که شما مجاز به تصویب برگ در تاریخهای بلوک
@@ -2459,8 +2459,8 @@
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: Serial No,Is Cancelled,آیا لغو
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,محموله من
-DocType: Journal Entry,Bill Date,بیل عضویت
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,محموله های من
+DocType: Journal Entry,Bill Date,تاریخ صورتحساب
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:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
DocType: Communication,Recipients,دریافت کنندگان
@@ -2484,7 +2484,7 @@
DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} است بیش از یک بار در مورد جدول انواع وارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1}بیش از یک بار در جدول وارد شده است
,Projected,بینی
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {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},توجه: مرجع تاریخ بیش از روز های اعتباری مجاز {0} روز {1} {2}
@@ -2510,7 +2510,7 @@
DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
DocType: Email Digest,Expenses booked for the digest period,هزینه رزرو برای مدت هضم
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
-DocType: Journal Entry Account,Journal Entry Account,مجله حساب ورود
+DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
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",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,گاز گرم فلز تشکیل
@@ -2570,7 +2570,7 @@
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory"">اضافه کردن / ویرایش</a>"
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
-apps/erpnext/erpnext/accounts/utils.py +235,Journal Entries {0} are un-linked,مطالب مجله {0} سازمان ملل متحد در ارتباط هستند
+apps/erpnext/erpnext/accounts/utils.py +235,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
DocType: Purchase Invoice,Terms,شرایط
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +235,Create New,ایجاد جدید
DocType: Buying Settings,Purchase Order Required,خرید سفارش مورد نیاز
@@ -2679,7 +2679,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,بانکداری سرمایه گذاری
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency",انتخاب کشور خود، منطقه زمانی و ارز
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} وضعیت Unstopped است
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} وضعیت دوباره فعال شده است
DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,ترشی
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,ریخته گری شن و ماسه
@@ -2689,7 +2689,7 @@
DocType: Newsletter,A Lead with this email id should exist,سرب با این ایمیل ID باید وجود داشته باشد
DocType: Stock Entry,From BOM,از BOM
DocType: Time Log,Billing Rate (per hour),نرخ حسابداری (در ساعت)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,اساسی
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,پایه
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +226,Please click on 'Generate Schedule',لطفا بر روی 'ایجاد برنامه کلیک کنید
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
@@ -2739,7 +2739,7 @@
DocType: Quotation,Maintenance Manager,مدیر نگهداری و تعمیرات
DocType: Workflow State,Search,جستجو
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,مجموع نمیتواند صفر باشد
-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,'روز پس از آخرین سفارش باید بزرگتر یا مساوی صفر باشد
+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,"""روز پس از آخرین سفارش"" باید بزرگتر یا مساوی صفر باشد"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,لحیم کاری
DocType: C-Form,Amended From,اصلاح از
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,مواد اولیه
@@ -2776,7 +2776,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,انتقال مواد به تامین کننده
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,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
DocType: Lead,Lead Type,سرب نوع
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,ایجاد عبارت
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,ایجاد استعلام
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},می توان با تصویب {0}
DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
@@ -2991,7 +2991,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} وضعیت است متوقف '
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} وضعیت 'متوقف' است
DocType: Account,Temporary,موقت
DocType: Address,Preferred Billing Address,ترجیح آدرس صورت حساب
DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
@@ -3009,7 +3009,7 @@
DocType: Purchase Order Item,Supplier Quotation,نقل قول تامین کننده
DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,اتو
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} است متوقف
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} متوقف شده است
apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
@@ -3110,7 +3110,7 @@
DocType: Stock Ledger Entry,Stock Ledger Entry,سهام لجر ورود
DocType: Department,Leave 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,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
-DocType: Accounts Settings,Accounts Settings,حساب تنظیمات
+DocType: Accounts Settings,Accounts Settings,تنظیمات حسابها
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,امکانات و ماشین آلات
DocType: Item,You can enter the minimum quantity of this item to be ordered.,شما می توانید وارد کنید حداقل مقدار این آیتم به دستور داده شود.
DocType: Sales Partner,Partner's Website,وب سایت همکار
@@ -3168,7 +3168,7 @@
DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
DocType: Notification Control,Purchase,خرید
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},وضعیت {0} {1} در حال حاضر {2}
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,تعادل تعداد
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,تعداد موجودی
DocType: Item Group,Parent Item Group,مورد گروه پدر و مادر
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} برای {1}
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,مراکز هزینه
@@ -3212,7 +3212,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,مدیر پروژه
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,اعزام
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
-DocType: Account,Receivable,قابل وصول
+DocType: Account,Receivable,دریافتنی
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
DocType: Sales Invoice,Supplier Reference,مرجع عرضه کننده کالا
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.",در صورت انتخاب، BOM برای اقلام زیر مونتاژ خواهد شد برای گرفتن مواد اولیه در نظر گرفته. در غیر این صورت، تمام آیتم های زیر مونتاژ خواهد شد به عنوان ماده خام درمان می شود.
@@ -3258,7 +3258,7 @@
DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,چکش
DocType: Features Setup,To enable <b>Point of Sale</b> view,برای فعال کردن <b>نقطه نظر فروش</b>
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'به روز' مورد نیاز است
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'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.",تولید بسته بندی ورقه برای بسته تحویل داده می شود. مورد استفاده به اطلاع تعداد بسته، محتویات بسته و وزن آن است.
DocType: Sales Invoice Item,Sales Order Item,سفارش فروش مورد
DocType: Salary Slip,Payment Days,روز پرداخت
@@ -3292,7 +3292,7 @@
DocType: Workflow State,Primary,اولیه
DocType: Expense Claim Detail,Expense Date,هزینه عضویت
DocType: Item,Max Discount (%),حداکثر تخفیف (٪)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +60,Last Order Amount,آخرین سفارش مبلغ
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +60,Last Order Amount,مبلغ آخرین سفارش
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Blasting,سندبلاست
DocType: Company,Warn,هشدار دادن
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +82,Item valuation updated,ارزیابی مورد به روز شده
@@ -3319,7 +3319,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Redrawing,ترسیم مجدد
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Etching,قلم زنی
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +55,Commission,کمیسیون
-apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,شما امکان پذیر نیست برای پاسخ به این بلیط.
+apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,شما مجاز به پاسخ دهی به این درخواست نیستید
DocType: Address Template,"<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>
@@ -3336,7 +3336,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,انبار در سیستم یافت نشد
DocType: Quality Inspection Reading,Quality Inspection 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.,`سهام یخ قدیمی تر Than` باید کوچکتر از٪ d روز باشد.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
,Project wise Stock Tracking,پروژه پیگیری سهام عاقلانه
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},نگهداری و تعمیرات برنامه {0} در برابر وجود دارد {0}
DocType: Stock Entry Detail,Actual Qty (at source/target),تعداد واقعی (در منبع / هدف)
@@ -3359,7 +3359,7 @@
DocType: Purchase Invoice Item,Price List Rate,لیست قیمت نرخ
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,تحویل سریال بدون {0} نمی تواند حذف شود
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",نمایش "در انبار" و یا "نه در بورس" بر اساس سهام موجود در این انبار.
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),بیل از مواد (BOM)
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),صورت مواد (BOM)
DocType: Time Log,Hours,ساعت
DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Rolling,نورد
@@ -3382,14 +3382,14 @@
DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +160,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,گزارش اصلی
+apps/erpnext/erpnext/config/stock.py +141,Main Reports,گزارشهای اصلی
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +73,Stock Ledger entries balances updated,سهام لجر نوشته توازن به روز شده
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,اضافه کردن / ویرایش قیمت
+apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,افزودن / ویرایش قیمتها
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,نمودار مراکز هزینه
,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,سفارشات من
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,سفارشهای من
DocType: Price List,Price List Name,لیست قیمت نام
DocType: Time Log,For Manufacturing,برای ساخت
DocType: BOM,Manufacturing,ساخت
@@ -3430,7 +3430,7 @@
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,تامین کنندگان خود را
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,تامین کنندگان شما
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
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.,یکی دیگر از ساختار حقوق {0} برای کارکنان فعال است {1}. لطفا مطمئن وضعیت خود را غیر فعال 'به عنوان خوانده شده
DocType: Purchase Invoice,Contact,تماس
@@ -3443,7 +3443,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Computer,کامپیوتر
DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +63,You are not authorized to set Frozen value,شما مجاز به مقدار منجمد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +63,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
DocType: Purchase Receipt,Date on which lorry started from supplier warehouse,تاریخ که در آن کامیون را از منبع انبار آغاز شده
DocType: Cost Center,Budgets,بودجه
@@ -3453,7 +3453,7 @@
DocType: Delivery Note,To Warehouse,به انبار
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},حساب {0} است بیش از یک بار برای سال مالی وارد شده است {1}
,Average Commission Rate,متوسط نرخ کمیسیون
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"فاقد سریال" نمی تواند به 'بله' برای غیر سهام مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال"" برای موارد غیر انباری نمی تواند ""بله"" باشد"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
DocType: Purchase Taxes and Charges,Account Head,سر حساب
@@ -3509,9 +3509,9 @@
DocType: Email Digest,Receivables,مطالبات
DocType: Quality Inspection Reading,Reading 5,خواندن 5
DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date",را وارد کنید ایمیل ID با کاما جدا شده، منظور خواهد شد به صورت خودکار در زمان مشخص از طریق پست
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,نام کمپین مورد نیاز است
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,نام کمپین الزامی است
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,گرد فعال
-DocType: Maintenance Visit,Maintenance Date,نگهداری و تعمیرات تاریخ
+DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
DocType: Purchase Receipt Item,Rejected Serial No,رد سریال
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Deep drawing,کشش عمیق
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",لطفا آیتم را انتخاب کنید که در آن "آیا مورد سهام" است "نه" و "آیا مورد فروش" است "بله" است و هیچ دیگر فروش BOM وجود دارد
@@ -3620,7 +3620,7 @@
DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,نمایش صفر ارزش
DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
-DocType: Payment Reconciliation,Receivable / Payable Account,دریافتنی / پرداختنی حساب
+DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
DocType: Item,Default Warehouse,به طور پیش فرض انبار
DocType: Task,Actual End Date (via Time Logs),واقعی پایان تاریخ (از طریق زمان سیاههها)
@@ -3634,7 +3634,7 @@
DocType: Appraisal,Total Score (Out of 5),نمره کل (از 5)
DocType: Contact Us Settings,State,دولت
DocType: Batch,Batch,دسته
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,تعادل
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,تراز
DocType: Project,Total Expense Claim (via Expense Claims),مجموع ادعای هزینه (از طریق ادعاهای هزینه)
DocType: User,Gender,جنس
DocType: Journal Entry,Debit Note,بدهی توجه داشته باشید
@@ -3686,7 +3686,7 @@
DocType: DocField,Default,پیش فرض
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",انتخاب "بله" اجازه خواهد داد که این مورد در سفارش خرید، رسید خرید را ظاهر می شود.
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} مشترکین اضافه
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} مشترک افزوده شد
DocType: Maintenance Schedule,Schedule,برنامه
DocType: Account,Parent Account,پدر و مادر حساب
DocType: Serial No,Available,در دسترس
@@ -3811,6 +3811,6 @@
DocType: GL Entry,Is Opening,باز
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Account {0} does not exist,حساب {0} وجود ندارد
-DocType: Account,Cash,پول نقد
+DocType: Account,Cash,نقد
DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},لطفا ساختار حقوق برای کارکنان ایجاد {0}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 6b39f6f..4961432 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -77,7 +77,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Travail du bois
DocType: Production Order Operation,Work In Progress,Work In Progress
DocType: Company,If Monthly Budget Exceeded,Si le budget mensuel dépassé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impression 3D
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impression en 3D
DocType: Employee,Holiday List,Liste de vacances
DocType: Time Log,Time Log,Temps Connexion
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Comptable
@@ -120,7 +120,7 @@
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,Vous ne pouvez pas ouvrir par exemple lorsque son {0} est ouvert
DocType: Item,Item Image (if not slideshow),Image Article (si ce n'est diaporama)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Il existe un client avec le même nom
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Heure Tarif / 60) * Opération Temps Réel
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Le tarif à l'heure / 60) * le temps réel d'opération
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,Coût des articles livrés
DocType: Blog Post,Guest,Invité
@@ -130,7 +130,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},Du {0} au {1}
DocType: Item,Copy From Item Group,Copy From Group article
DocType: Journal Entry,Opening Entry,Entrée ouverture
-apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,Restrictions de l'utilisateur
+apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} est obligatoire
apps/erpnext/erpnext/config/setup.py +111,Contact master.,'N'a pas de série »ne peut pas être « Oui »pour non - article en stock
apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
DocType: Lead,Product Enquiry,Demande d'information produit
@@ -338,7 +338,7 @@
DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en nomenclature , bon de livraison , facture d'achat , ordre de production, bon de commande , bon de réception , la facture de vente , Sales Order , Stock entrée , des feuilles de temps"
DocType: Item Tax,Tax Rate,Taux d'imposition
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Sélectionner un élément
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} statut est arrêté
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,L'état {0} {1} est arrêté
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
Stock réconciliation, utiliser à la place l'entrée en stock géré"
@@ -353,7 +353,7 @@
DocType: Email Digest,Income booked for the digest period,Revenu réservée pour la période digest
apps/erpnext/erpnext/config/setup.py +106,Supplier master.,Maître du fournisseur .
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,S'il vous plaît voir la pièce jointe
-DocType: Purchase Order,% Received,Reçus%
+DocType: Purchase Order,% Received,% reçus
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,découpe au jet d'eau
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,Configuration déjà terminée !
,Finished Goods,Produits finis
@@ -382,7 +382,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,S'il vous plaît entrer Achat réception Non pour passer
DocType: Landed Cost Item,Applicable Charges,Frais applicables
DocType: Workstation,Consumable Cost,Coût de consommable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Congé approbateur '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Raison pour perdre
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Tube de perles
@@ -404,7 +404,7 @@
DocType: Account,Is Group,Est un groupe
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Thermoformage
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Refendage
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',«L'affaire no ' ne peut pas être inférieure à 'De Cas n °'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',«Le cas No ' ne peut pas être inférieure à 'Du Cas No'
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,À but non lucratif
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Non commencé
DocType: Lead,Channel Partner,Channel Partner
@@ -482,8 +482,7 @@
DocType: Company,Delete Company Transactions,Supprimer Transactions Société
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
- Email Address'","{0} est une adresse de courriel valide dans «notification \
- Adresse e-mail '"
+ Email Address'",{0} est une adresse de courriel invalide dans «La notification de l'Adresse électronique'
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturation totale de cette année:
DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
@@ -554,7 +553,7 @@
DocType: Employee,Reason for Resignation,Raison de la démission
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Modèle pour l'évaluation du rendement .
DocType: Payment Reconciliation,Invoice/Journal Entry Details,Facture / Journal Détails Entrée
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},Profil d'emploi
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' n'est pas dans l'année financière {2}
DocType: Buying Settings,Settings for Buying Module,Réglages pour l'achat Module
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Se il vous plaît entrer Achat Reçu premier
DocType: Buying Settings,Supplier Naming By,Fournisseur de nommage par
@@ -566,7 +565,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,De ticket de caisse
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Types d'emploi ( permanent, contractuel , stagiaire , etc ) ."
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peut pas être identique
DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
sites/assets/js/form.min.js +253,To,à
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,Veuillez entrer une adresse E-mail .
@@ -636,8 +635,8 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you really want to UNSTOP,Voulez-vous vraiment à déboucher
DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ordre de fabrication {0} doit être soumis
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,« De Date ' est nécessaire
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} n'est pas une article de stock
DocType: Mode of Payment Account,Default Account,Compte par défaut
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Chef de file doit être réglée si l'occasion est composé de plomb
DocType: Contact Us Settings,Address Title,Titre de l'adresse
@@ -768,7 +767,7 @@
,Purchase Receipt Trends,Achat Tendances reçus
DocType: Appraisal,Select template from which you want to get the Goals,Sélectionnez le modèle à partir duquel vous souhaitez obtenir des Objectifs
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Research & Development,Recherche & Développement
-,Amount to Bill,Montant du projet de loi
+,Amount to Bill,Montant à facturer
DocType: Company,Registration Details,Détails de l'enregistrement
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,Jalonnement
DocType: Item Reorder,Re-Order Qty,Re-commande Quantité
@@ -968,7 +967,7 @@
DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
DocType: Contact Us Settings,Address,Adresse
DocType: Expense Claim,From Employee,De employés
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1} en aucun exercice. Pour plus de détails, consultez {2}."
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1} n'est pas dans aucun année financière. Pour plus de détails, consultez {2}."
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
DocType: Journal Entry,Make Difference Entry,Assurez Entrée Différence
DocType: Upload Attendance,Attendance From Date,Participation De Date
@@ -1041,7 +1040,7 @@
DocType: Global Defaults,Current Fiscal Year,Exercice en cours
DocType: Global Defaults,Disable Rounded Total,Désactiver totale arrondie
DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,précédent
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
,Trial Balance,Balance
sites/assets/js/erpnext.min.js +2,"Grid ""","grille """
@@ -1082,7 +1081,7 @@
DocType: GL Entry,Against Voucher,Bon contre
DocType: Item,Default Buying Cost Center,Centre de coûts d'achat par défaut
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,Point {0} doit être objet de vente
-,Accounts Payable Summary,Comptes à payer Résumé
+,Accounts Payable Summary,Le résumé des comptes à payer
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},Message totale (s )
DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître .
@@ -1152,7 +1151,7 @@
DocType: Purchase Invoice,Taxes and Charges Calculation,Taxes et frais de calcul
DocType: BOM Operation,Workstation,station de travail
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +107,Hardware,Sales Person cible Variance article Groupe Sage
-DocType: Attendance,HR Manager,Directeur des Ressources Humaines
+DocType: Attendance,HR Manager,Responsable des Ressources Humaines
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +47,Privilege Leave,Point {0} doit être fonction Point
DocType: Purchase Invoice,Supplier Invoice Date,Date de la facture fournisseur
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +169,You need to enable Shopping Cart,Vous devez activer Panier
@@ -1199,7 +1198,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',Le statut d'approbation doit être 'Approuvé' ou 'Rejeté'
DocType: Sales Invoice,Sales BOM Help,Aide nomenclature des ventes
DocType: Purchase Invoice,Contact Person,Personne à contacter
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',Pas de description
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date','La date de début attendue' ne peut pas être supérieur à ' la date de fin attendue'
DocType: Holiday List,Holidays,Fêtes
DocType: Sales Order Item,Planned Quantity,Quantité planifiée
DocType: Purchase Invoice Item,Item Tax Amount,Taxes article
@@ -1304,7 +1303,7 @@
DocType: Landed Cost Voucher,Landed Cost Help,Aide Landed Cost
DocType: Event,Tuesday,Mardi
DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
-,Accounts Receivable Summary,Comptes débiteurs Résumé
+,Accounts Receivable Summary,Le résumé de comptes débiteurs
apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,Se il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
DocType: UOM,UOM Name,Nom UDM
DocType: Top Bar Item,Target,Cible
@@ -1466,7 +1465,7 @@
DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exporter le rapport et l'imprimer à l'aide d'un tableur.
DocType: Sales Invoice Item,Batch No,Numéro du lot
-apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Nombre de points pour tous les objectifs devraient être 100 . C'est {0}
+apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Principal
DocType: DocPerm,Delete,Supprimer
apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
sites/assets/js/desk.min.js +836,New {0},Nouvelle {0}
@@ -1524,7 +1523,7 @@
DocType: Packing Slip,To Package No.,Pour Emballer n °
DocType: DocType,System,Système
DocType: Warranty Claim,Issue Date,Date d'émission
-DocType: Activity Cost,Activity Cost,Activité Coût
+DocType: Activity Cost,Activity Cost,Le coût de l'activité
DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,télécommunications
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
@@ -1570,13 +1569,13 @@
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Point arborescence de groupe
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Point {0} n'est pas configuré pour maître numéros de série Check Point
DocType: Maintenance Visit,Maintenance Time,Temps de maintenance
-,Amount to Deliver,Montant Deliver
+,Amount to Deliver,Nombre à livrer
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,Un produit ou service
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,Il y avait des erreurs .
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,Tapotement
DocType: Naming Series,Current Value,Valeur actuelle
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},Elément de modèle ne peut pas avoir stock et varaiants. Se il vous plaît retirer stocks des entrepôts {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,L'article est mis à jour
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} créé
DocType: Journal Entry Account,Against Sales Order,Contre Commande
,Serial No Status,N ° de série Statut
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Tableau de l'article ne peut pas être vide
@@ -1588,7 +1587,7 @@
DocType: Sales Person,Name and Employee ID,Nom et ID employé
apps/erpnext/erpnext/accounts/party.py +186,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
DocType: Website Item Group,Website Item Group,Groupe Article Site
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,S'il vous plaît mettre trésorerie de défaut ou d'un compte bancaire en mode de paiement {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Frais et taxes
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +275,Please enter Reference date,S'il vous plaît entrer Date de référence
DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour le point qui sera affiché dans le site Web
DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
@@ -1629,7 +1628,7 @@
DocType: Communication,Date,Date
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répétez Revenu à la clientèle
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.,Veuillez patienter pendant l’installation. L’opération peut prendre quelques minutes.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""frais approbateur '"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de frais'"
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Assistant de configuration
DocType: Bank Reconciliation Detail,Against Account,Contre compte
DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
@@ -1660,8 +1659,8 @@
apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborescence des comptes financiers.
DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide si cela est jugé pour tous les types d'employés
DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer accusations fondées sur
-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,Compte {0} doit être de type ' actif fixe ' comme objet {1} est un atout article
-DocType: HR Settings,HR Settings,Réglages RH
+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,Compte {0} doit être de type ' Actif ' comme objet {1} est un article Actif
+DocType: HR Settings,HR Settings,Paramètrages RH
apps/frappe/frappe/config/setup.py +130,Printing,Impression
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
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.,S'il vous plaît entrer comptes débiteurs groupe / à payer en master de l'entreprise
@@ -1693,7 +1692,7 @@
DocType: Salary Slip,Deduction,Déduction
DocType: Address Template,Address Template,Modèle d'adresse
DocType: Territory,Classification of Customers by region,Classification des clients par région
-DocType: Project,% Tasks Completed,% les tâches terminées
+DocType: Project,% Tasks Completed,% des tâches terminées
DocType: Project,Gross Margin,Marge brute
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,S'il vous plaît entrer en production l'article premier
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,utilisateur désactivé
@@ -1704,7 +1703,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Coût Mise à jour
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,Êtes-vous sûr de vouloir déboucher
DocType: Employee,Date of Birth,Date de naissance
-DocType: Salary Manager,Salary Manager,Salaire Responsable
+DocType: Salary Manager,Salary Manager,Responsable des salaires
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Exercice ** représente un exercice. Toutes les écritures comptables et autres transactions majeures sont suivis contre ** Exercice **.
DocType: Opportunity,Customer / Lead Address,Client / plomb adresse
@@ -1739,14 +1738,14 @@
apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
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","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, se il vous plaît situé dans Réglages Stock"
DocType: Employee,Bank Name,Nom de la banque
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Au-dessus
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,Territoire cible Variance article Groupe Sage
DocType: Leave Application,Total Leave Days,Total des jours de congé
DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque: E-mail ne sera pas envoyé aux utilisateurs handicapés
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Sélectionnez Société ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide si cela est jugé pour tous les ministères
apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",S'il vous plaît vous connecter à Upvote !
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} est obligatoire pour objet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
DocType: Currency Exchange,From Currency,De Monnaie
DocType: DocField,Name,Nom
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
@@ -1771,7 +1770,7 @@
DocType: Quality Inspection,In Process,In Process
DocType: Authorization Rule,Itemwise Discount,Remise Itemwise
DocType: Purchase Receipt,Detailed Breakup of the totals,Breakup détaillée des totaux
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} contre Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
DocType: Account,Fixed Asset,Actifs immobilisés
DocType: Time Log Batch,Total Billing Amount,Montant total de la facturation
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte à recevoir
@@ -1861,13 +1860,13 @@
DocType: SMS Log,Sender Name,Nom de l'expéditeur
DocType: Page,Title,Titre
sites/assets/js/list.min.js +92,Customize,Personnaliser
-DocType: POS Setting,[Select],[Sélectionner ]
+DocType: POS Setting,[Select],[Choisir ]
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Faire la facture de vente
DocType: Company,For Reference Only.,Pour référence seulement.
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Non valide {0}: {1}
DocType: Sales Invoice Advance,Advance Amount,Montant de l'avance
DocType: Manufacturing Settings,Capacity Planning,Planification des capacités
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Série mise à jour avec succès
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Date début' est nécessaire
DocType: Journal Entry,Reference Number,Numéro de référence
DocType: Employee,Employment Details,Détails de l'emploi
DocType: Employee,New Workplace,Travail du Nouveau-
@@ -1953,7 +1952,7 @@
DocType: Print Settings,Modern,Moderne
DocType: Communication,Replied,Répondu
DocType: Payment Tool,Total Payment Amount,Montant du paiement total
-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}) ne peut pas être supérieure à quanitity prévu ({2}) en ordre de fabrication {3}
+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}) ne peut pas être supérieure à quanitity prévu ({2}) dans la commande de fabrication {3}
DocType: Shipping Rule,Shipping Rule Label,Livraison règle étiquette
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
DocType: Newsletter,Test,Test
@@ -1961,7 +1960,7 @@
DocType: Employee,Previous Work Experience,L'expérience de travail antérieure
DocType: Stock Entry,For Quantity,Pour Quantité
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},Vous ne pouvez pas sélectionner le type de charge comme « Sur la ligne précédente Montant » ou « Le précédent Row totale » pour l'évaluation . Vous ne pouvez sélectionner que l'option «Total» pour le montant de la ligne précédente ou total de la ligne précédente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,Accepté Rejeté + Quantité doit être égale à la quantité reçue pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} n'a pas été soumis
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Gestion des demandes d'articles.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pour la production séparée sera créée pour chaque article produit fini.
DocType: Email Digest,New Communications,Communications Nouveau-
@@ -2003,7 +2002,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / revendeur / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise pour une commission.
DocType: Customer Group,Has Child Node,A Node enfant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} contre bon de commande {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamme vieillissement 1
@@ -2156,7 +2155,7 @@
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Nouveau centre de coûts Nom
DocType: Leave Control Panel,Leave Control Panel,Laisser le Panneau de configuration
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.,Aucune valeur par défaut Adresse modèle trouvé. S'il vous plaît créer un nouveau à partir de Configuration> Presse et Branding> Adresse modèle.
-DocType: Appraisal,HR User,HR utilisateur
+DocType: Appraisal,HR User,Utilisateur HR
DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et frais déduits
apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Questions
apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},Le statut doit être l'un des {0}
@@ -2182,7 +2181,7 @@
DocType: Stock Settings,Default Valuation Method,Méthode d'évaluation par défaut
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Polishing,Polissage
DocType: Production Order Operation,Planned Start Time,Heure de début prévue
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Numéroté
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Alloué
apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
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 et le Parti ne est applicable contre débiteurs / Comptes fournisseurs
@@ -2243,7 +2242,7 @@
DocType: Project Task,Working,De travail
DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock file d'attente (FIFO)
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,S'il vous plaît sélectionner registres de temps.
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},joindre l'image
+apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},{0} n'appartient pas à la société {1}
,Requested Qty,Quantité demandée
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","Les frais seront distribués proportionnellement en fonction de l'article Quantité ou montant, selon votre sélection"
@@ -2262,7 +2261,7 @@
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Vitesse à laquelle la devise du client est converti en devise de base entreprise
DocType: Purchase Invoice,Discount Amount (Company Currency),Montant de la remise (Société devise)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès à partir de cette liste.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste.
DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux net (Société devise)
apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Gérer l'arboressence des territoirs.
DocType: Payment Reconciliation Payment,Sales Invoice,Facture de vente
@@ -2304,7 +2303,7 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal
DocType: Stock Entry,Subcontract,Sous-traiter
DocType: Production Planning Tool,Get Items From Sales Orders,Obtenir des éléments de Sales Orders
-DocType: Production Order Operation,Actual End Time,Temps réel Fin
+DocType: Production Order Operation,Actual End Time,Fin du temps réel
DocType: Production Planning Tool,Download Materials Required,Télécharger Matériel requis
DocType: Item,Manufacturer Part Number,Numéro de pièce du fabricant
DocType: Production Order Operation,Estimated Time and Cost,Durée et Coût estimatif
@@ -2407,7 +2406,7 @@
apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Sélectionner le type de transaction
DocType: GL Entry,Voucher No,Bon Pas
DocType: Leave Allocation,Leave Allocation,Laisser Allocation
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,Remarque: la date d'échéance dépasse les jours de crédit accordés par {0} jour (s )
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,'La mise à jour de la réserve' pour les factures de vente {0} doivent être configurées
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,Devis {0} de type {1}
apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,Modèle de termes ou d'un contrat.
DocType: Employee,Feedback,Commentaire
@@ -2468,7 +2467,7 @@
apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Alternative lien de téléchargement
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
DocType: Leave Allocation,Carry Forwarded Leaves,Effectuer Feuilles Transmises
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',« Date d' 'doit être après « à jour »
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date du' doit être antérieur à la 'Date'
,Stock Projected Qty,Stock projeté Quantité
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
DocType: Warranty Claim,From Company,De Company
@@ -2515,7 +2514,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,De offre
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Compte {0} ne existe pas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Le compte {0} ne existe pas
DocType: Purchase Receipt Item,Purchase Order Item No,Achetez article ordonnance n
DocType: System Settings,System Settings,Paramètres système
DocType: Project,Project Type,Type de projet
@@ -2554,7 +2553,7 @@
DocType: Project,Total Costing Amount (via Time Logs),Montant total Costing (via Time Logs)
DocType: Purchase Order Item Supplied,Stock UOM,Stock UDM
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,entrer une valeur
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} est entré plus d'une fois au poste tableau Variantes
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} est entré plus d'une fois dans le tableau des variants d'objets
,Projected,Projection
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Les paramètres par défaut pour les transactions boursières .
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Note: Reference Date exceeds allowed credit days by {0} days for {1} {2},Remarque: Date de référence dépasse jours de crédit autorisées par {0} jours pour {1} {2}
@@ -2698,7 +2697,7 @@
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.","Inscrivez vos têtes d'impôt (par exemple, la TVA , accises , ils doivent avoir des noms uniques ) et leur taux standard."
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour objet {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Remarque: Si le paiement ne est pas faite contre toute référence, assurez Journal entrée manuellement."
DocType: Item,Supplier Items,Fournisseur Articles
@@ -2713,7 +2712,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Date de naissance ne peut pas être supérieure à aujourd'hui.
,Stock Ageing,Stock vieillissement
DocType: Purchase Receipt,Automatically updated from BOM table,Mise à jour automatique de la table BOM
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} {1} 'est désactivée
+apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}' est désactivée
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvrir
DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des e-mails automatiques aux contacts sur les transactions Soumission.
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +282,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2750,7 +2749,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,Banques d'investissement
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Sélectionnez votre pays, Fuseau horaire et devise"
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,Vous ne pouvez pas reporter le numéro de rangée supérieure ou égale à numéro de la ligne actuelle pour ce type de charge
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} l'état est en cours
DocType: Purchase Invoice,Price List Exchange Rate,Taux de change Prix de liste
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,Décapage
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,Moulage en sable
@@ -2808,10 +2807,10 @@
apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
DocType: Sales Invoice,Shipping Rule,Livraison règle
DocType: Journal Entry,Print Heading,Imprimer Cap
-DocType: Quotation,Maintenance Manager,Maintenance Manager
+DocType: Quotation,Maintenance Manager,Responsable de l'entretien
DocType: Workflow State,Search,Rechercher
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
-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,Arbre de centres de coûts finanial .
+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,'Jours depuis la dernière commande' doit être supérieur ou égale à zéro
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,Brasage
DocType: C-Form,Amended From,Modifié depuis
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,Matières premières
@@ -2864,7 +2863,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Routing,Routage
DocType: C-Form,Invoices,Factures
DocType: Job Opening,Job Title,Titre de l'emploi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} bénéficiaires
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} destinataires
DocType: Features Setup,Item Groups in Details,Groupes d'articles en détails
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,Compte de dépenses est obligatoire
apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2968,7 +2967,7 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,{0} {1} contre facture {1}
DocType: Sales Team,Contact No.,Contactez No.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,dépréciation
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
DocType: Workflow State,Time,Temps
DocType: Features Setup,Sales Discounts,Escomptes sur ventes
DocType: Hub Settings,Seller Country,Vendeur Pays
@@ -3061,10 +3060,10 @@
DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé
,Territory Target Variance Item Group-Wise,Entretien Visitez {0} doit être annulée avant d'annuler cette commande client
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que dossier de change n'est pas créé pour {1} et {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Compte {0}: compte de Parent {1} n'existe pas
DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',Type Nom de la partie
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} l'état est 'Arrêté'
DocType: Account,Temporary,Temporaire
DocType: Address,Preferred Billing Address,Préféré adresse de facturation
DocType: Monthly Distribution Percentage,Percentage Allocation,Répartition en pourcentage
@@ -3169,7 +3168,7 @@
DocType: Batch,Batch ID,Identifiant du lot
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
,Delivery Note Trends,Bordereau de livraison Tendances
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} doit être un article acheté ou sous-traitées à la ligne {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} doit être un article d'achat ou sous-traitées à la ligne {1}
apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,Compte: {0} ne peut être mis à jour via les transactions boursières
DocType: GL Entry,Party,Intervenants
DocType: Sales Order,Delivery Date,Date de livraison
@@ -3190,7 +3189,7 @@
DocType: Sales Partner,Partner's Website,Le site web du partenaire
DocType: Opportunity,To Discuss,Pour discuter
DocType: SMS Settings,SMS Settings,Paramètres SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes temporaires
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes provisoires
DocType: Payment Tool,Column Break 1,Saut de colonne 1
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Noir
DocType: BOM Explosion Item,BOM Explosion Item,Article éclatement de la nomenclature
@@ -3329,10 +3328,10 @@
apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuration serveur entrant de soutien id e-mail . (par exemple support@example.com )
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +35,Shortage Qty,Qté non couverte
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 et le Parti est nécessaire pour recevoir / payer compte {1}
-DocType: Salary Slip,Salary Slip,Glissement des salaires
+DocType: Salary Slip,Salary Slip,Fiche de paye
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Brunissage
DocType: Features Setup,To enable <b>Point of Sale</b> view,Pour activer <b> point de vente < / b > vue
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,Compte {0} existe déjà
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'La date' est requise
DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Générer bordereaux des paquets à livrer. Utilisé pour notifier numéro de colis, le contenu du paquet et son poids."
DocType: Sales Invoice Item,Sales Order Item,Poste de commande client
DocType: Salary Slip,Payment Days,Jours de paiement
@@ -3421,7 +3420,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Entrepôt pas trouvé dans le système
DocType: Quality Inspection Reading,Quality Inspection Reading,Lecture d'inspection de la qualité
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.,Fichier source
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Figer les stocks datant de plus` doit être inférieur que %d jours.
,Project wise Stock Tracking,Projet sage Stock Tracking
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Champ {0} n'est pas sélectionnable.
DocType: Stock Entry Detail,Actual Qty (at source/target),Quantité réelle (à la source / cible)
@@ -3479,14 +3478,14 @@
DocType: Time Log,For Manufacturing,Pour Manufacturing
DocType: BOM,Manufacturing,Fabrication
,Ordered Items To Be Delivered,Articles commandés à livrer
-DocType: Account,Income,Extraire automatiquement les demandeurs d'emploi à partir d'une boîte aux lettres
+DocType: Account,Income,Revenu
,Setup Wizard,Assistant de configuration
DocType: Industry Type,Industry Type,Secteur d'activité
apps/erpnext/erpnext/templates/includes/cart.js +264,Something went wrong!,Quelque chose se est mal passé!
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attention: la demande d'autorisation contient les dates de blocs suivants
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d'achèvement
-DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Société Monnaie)
+DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,Moulage sous pression
DocType: Email Alert,Reference Date,Date de Référence
apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unité d'organisation (département) maître .
@@ -3572,7 +3571,7 @@
DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu'à
apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche.
apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Générer les bulletins de salaire
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,S'il vous plaît sélectionner la valeur de groupe ou Ledger
+apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} n'est pas un identifiant de courriel valide
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifiée, si pour Applicable est sélectionné comme {0}"
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
DocType: ToDo,Low,Bas
@@ -3626,7 +3625,7 @@
DocType: Notification Control,Prompt for Email on Submission of,Prompt for Email relative à la présentation des
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Point {0} doit être un stock Article
apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,Les paramètres par défaut pour les opérations comptables .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} est indispensable
+apps/frappe/frappe/model/naming.py +40,{0} is required,{0} est nécessaire
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Le moulage sous vide
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
DocType: Contact Us Settings,City,Ville
@@ -3745,13 +3744,13 @@
DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Maintenir même taux long cycle de vente
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},développer
DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifiez les journaux de temps en dehors des heures de travail Workstation.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,"S'il vous plaît entrer » est sous-traitée "" comme Oui ou Non"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} a déjà été soumis
,Items To Be Requested,Articles à demander
DocType: Purchase Order,Get Last Purchase Rate,Obtenez Purchase Rate Dernière
DocType: Company,Company Info,Informations sur l'entreprise
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Seaming,Seaming
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Configuration serveur entrant pour les ventes id e-mail . (par exemple sales@example.com )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article
DocType: Fiscal Year,Year Start Date,Date de début Année
DocType: Attendance,Employee Name,Nom de l'employé
@@ -3759,7 +3758,7 @@
DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrondie (Société Monnaie)
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
DocType: Purchase Common,Purchase Common,Achat commun
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,Point ou Entrepôt à la ligne {0} ne correspond pas à la Demande de Matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. S.V.P rafraîchir.
DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Empêcher les utilisateurs de faire des demandes d'autorisation, les jours suivants."
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,De Opportunity
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Obturation
@@ -3824,7 +3823,7 @@
DocType: BOM,With Operations,Avec des opérations
,Monthly Salary Register,S'enregistrer Salaire mensuel
apps/frappe/frappe/website/template.py +120,Next,Suivant
-DocType: Warranty Claim,If different than customer address,Point {0} a déjà été renvoyé
+DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
DocType: BOM Operation,BOM Operation,Opération BOM
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electropolishing,Électrolytique
DocType: Purchase Taxes and Charges,On Previous Row Amount,Le montant rangée précédente
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 650259e..20ce0c8 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -120,7 +120,7 @@
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,"Nadređeni proizvod {0} ne smije biti skladišni proizvod, ali mora biti prodajni"
DocType: Item,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Sat stopa / 60) * Stvarna Operacija vrijeme
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
DocType: SMS Log,SMS Log,SMS Prijava
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih stavki
DocType: Blog Post,Guest,Gost
@@ -337,7 +337,7 @@
DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
DocType: Item Tax,Tax Rate,Porezna stopa
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Odaberite stavku
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} status zaustavljen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} status stopiran
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
Stock Reconciliation, instead use Stock Entry","Stavka: {0} uspio turi, ne mogu se pomiriti pomoću \
skladišta pomirenje, umjesto da koristite Stock unos"
@@ -381,7 +381,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,Unesite kupiti primitka No za nastavak
DocType: Landed Cost Item,Applicable Charges,Troškove u
DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Ostavite Odobritelj '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Liječnički
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Razlog gubitka
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Tube izvlačenja
@@ -646,7 +646,7 @@
DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
DocType: Employee,Cell Number,Mobitel Broj
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +139,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Temeljnica' koloni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +139,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Energy,energija
DocType: Opportunity,Opportunity From,Prilika od
apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
@@ -744,7 +744,7 @@
apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Upiti podršci.
DocType: Bin,Moving Average Rate,Stopa prosječne ponderirane cijene
DocType: Production Planning Tool,Select Items,Odaberite proizvode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} od {1} Bill datira {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
DocType: Communication,Reference Name,Referenca Ime
DocType: Maintenance Visit,Completion Status,Završetak 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","Za praćenje branda u sljedećim dokumentima Dostavnica, Opportunity , materijal zahtjev, predmet, narudžbenice , kupnju vouchera Kupac prijemu, ponude, prodaje fakture , prodaje sastavnice , prodajnog naloga , rednim brojem"
@@ -900,7 +900,7 @@
apps/erpnext/erpnext/templates/form_grid/item_grid.html +67,Discount,Popust
DocType: Features Setup,Purchase Discounts,Kupnja Popusti
DocType: Stock Entry,This will override Difference Account in Item,To će nadjačati razliku račun u točki
-DocType: Workstation,Wages,Plata
+DocType: Workstation,Wages,Plaće
DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurirati samo ako vrijeme Log 'naplativo'
DocType: Project,Internal,Interni
DocType: Task,Urgent,Hitan
@@ -965,7 +965,7 @@
DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
DocType: Contact Us Settings,Address,Adresa
DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} nije u poslovnu godinu. Za više detalja pogledajte {2}.
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} nije u fiskalnoj godine. Za više detalja pogledajte {2}.
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
DocType: Upload Attendance,Attendance From Date,Gledanost od datuma
@@ -1134,7 +1134,7 @@
DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
DocType: Applicable Territory,Applicable Territory,Primjenjiva teritorija
apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
-DocType: Journal Entry,Journal Entry,Časopis Stupanje
+DocType: Journal Entry,Journal Entry,Temeljnica
DocType: Workstation,Workstation Name,Ime Workstation
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,E-pošta:
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
@@ -1483,7 +1483,7 @@
DocType: Territory,Territory Name,Naziv teritorija
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Podnositelj prijave za posao.
-DocType: Sales Invoice Item,Warehouse and Reference,Skladište i upute
+DocType: Sales Invoice Item,Warehouse and Reference,Skladište i reference
DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
DocType: Country,Country,Zemlja
apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,Adrese
@@ -1626,7 +1626,7 @@
DocType: Communication,Date,Datum
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
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.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Rashodi Odobritelj '"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Par
DocType: Bank Reconciliation Detail,Against Account,Protiv računa
DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
@@ -1681,7 +1681,7 @@
DocType: Email Digest,Support,Podrška
DocType: Authorization Rule,Approving Role,Odobravanje ulogu
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +89,Please specify currency in Company,Navedite valutu u Društvu
-DocType: Workstation,Wages per hour,Plaće po satu
+DocType: Workstation,Wages per hour,Satnice
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},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
apps/erpnext/erpnext/config/setup.py +53,"Show / Hide features like Serial Nos, POS etc.","Prikaži / sakrij značajke kao što su serijski broj, prodajno mjesto i sl."
DocType: Purchase Receipt,LR No,LR Ne
@@ -1908,7 +1908,7 @@
DocType: Appraisal,Employee,Zaposlenik
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e od
DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} potpunosti se naplaćuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
DocType: Workstation Working Hour,End Time,Kraj vremena
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,Grupa po jamcu
@@ -2000,7 +2000,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Treća strana distributer / trgovac / trgovački zastupnik / affiliate / prodavača koji prodaje tvrtki koje proizvode za proviziju.
DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} protiv narudžbenice {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Raspon 1
@@ -2551,7 +2551,7 @@
DocType: Project,Total Costing Amount (via Time Logs),Ukupno Obračun troškova Iznos (preko Vrijeme Trupci)
DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} je ušao više od jednom u točki varijante tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} je unesen više od jednom u tabeli varijanti stavki
,Projected,Predviđeno
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {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},Napomena: Referentna Datum prelazi dopuštene kreditne dana od {0} dana za {1} {2}
@@ -2747,7 +2747,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,Investicijsko bankarstvo
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Odaberite svoju zemlju, vremensku zonu i valutu"
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} status Unstopped
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} status odblokiran
DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,Stavljanje u turšiju
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,Pijesak lijevanje
@@ -2959,7 +2959,7 @@
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ukupni prihodi
,Monthly Attendance Sheet,Mjesečna lista posjećenosti
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,Nije pronađen zapis
-apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: troška je obvezno za točku {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,Račun {0} nije aktivan
DocType: GL Entry,Is Advance,Je Predujam
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Gledanost od datuma do datuma je obvezna
@@ -3061,7 +3061,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} status ' Zaustavljen '
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} status ' Stopiran '
DocType: Account,Temporary,Privremen
DocType: Address,Preferred Billing Address,Željena adresa za naplatu
DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
@@ -3103,7 +3103,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
DocType: Serial No,Out of Warranty,Od jamstvo
DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} od prodaje fakturu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
DocType: Purchase Invoice Item,Project Name,Naziv projekta
DocType: Workflow State,Edit,Uredi
@@ -3204,7 +3204,7 @@
DocType: Page,Page Name,Ime stranice
DocType: Purchase Invoice,Exchange Rate,Tečaj
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Nadređeni račun {1} ne pripada tvrtki {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Vretena završna obrada
DocType: Material Request,% of materials ordered against this Material Request,% robe od ove zahtjeva sa robom je isporučeno
DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
@@ -3786,7 +3786,7 @@
DocType: Employee,Current Address Is,Trenutni Adresa je
DocType: Address,Office,Ured
apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardno izvješće
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Računovodstvo unosi u dnevnik.
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Knjigovodstvene temeljnice
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +227,Please enter Expense Account,Unesite trošak računa
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 2f43ba3..88168bb 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -27,7 +27,7 @@
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},"Kérjük, állítsa Google Drive kisegítő billentyűk {0}"
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,Az anyagi kérése
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0} Fa
-DocType: Job Applicant,Job Applicant,Munka Kérelmező
+DocType: Job Applicant,Job Applicant,Állásra pályázó
apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,Jogi
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tényleges típusú adó nem lehet jogcím tartalmazza ráta sorban {0}
@@ -60,7 +60,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Hitelekkel (kötelezettségek)
DocType: Employee Education,Year of Passing,Év Passing
DocType: Designation,Designation,Titulus
-DocType: Production Plan Item,Production Plan Item,Gyártási terv Elem
+DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele
apps/erpnext/erpnext/hr/doctype/employee/employee.py +137,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve Employee {1}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Health Care,Egészségügyi ellátás
DocType: Purchase Invoice,Monthly,Havi
@@ -75,16 +75,16 @@
DocType: Delivery Note,Vehicle No,Jármű No
sites/assets/js/erpnext.min.js +50,Please select Price List,"Kérjük, válasszon árjegyzéke"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Faipari
-DocType: Production Order Operation,Work In Progress,Work in Progress
+DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
DocType: Company,If Monthly Budget Exceeded,Ha Havi költségvetés Meghaladta
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,3D nyomtatás
-DocType: Employee,Holiday List,Nyaralás listája
-DocType: Time Log,Time Log,Idő Bejelentkezés
+DocType: Employee,Holiday List,Szabadnapok listája
+DocType: Time Log,Time Log,Időnapló
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Könyvelő
-DocType: Company,Phone No,Telefon No
+DocType: Company,Phone No,Telefonszám
DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bejelentkezés végzett tevékenységek, amelyeket a felhasználók ellen feladatok, melyek az adatok nyomon követhetők időt, számlázási."
apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Új {0}: # {1}
-,Sales Partners Commission,Értékesítési Partners Bizottság
+,Sales Partners Commission,Értékesítő partner jutaléka
apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,"Rövidítése nem lehet több, mint 5 karakter"
DocType: Backup Manager,Allow Google Drive Access,Google Drive hozzáférés engedélyezése
DocType: Email Digest,Projects & System,Projects & Rendszer
@@ -93,13 +93,13 @@
DocType: Shopping Cart Settings,Shipping Rules,Szállítás szabályai
DocType: BOM,Operations,Művelet
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nem lehet beállítani engedély alapján a kedvezmény {0}
-DocType: Bin,Quantity Requested for Purchase,Mennyiség vételhez
+DocType: Bin,Quantity Requested for Purchase,Igényelt beszerzendő mennyiség
DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Erősítse .csv fájlt két oszlopot, az egyik a régi nevet, a másik az új nevet"
DocType: Packed Item,Parent Detail docname,Szülő Részlet 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.,Nyitva munkát.
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Nyitott állások
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +5,Advertising,Hirdetés
-DocType: Employee,Married,Nős
+DocType: Employee,Married,Házas
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,Grocery,Élelmiszerbolt
@@ -110,18 +110,18 @@
DocType: SMS Center,All Sales Person,Minden értékesítő
DocType: Backup Manager,Credentials,Megbízólevél
DocType: Purchase Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Ellenőrizze, hogy a visszatérő érdekében, törölje megállítani visszatérő vagy tegye megfelelő End Date"
-DocType: Sales Invoice Item,Sales Invoice Item,Értékesítési számlák Elem
+DocType: Sales Invoice Item,Sales Invoice Item,Eladási számla tételei
DocType: Account,Credit,Követelés
apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Kérjük, beállítási Employee névadási rendszerben Human Resource> HR Beállítások"
DocType: POS Setting,Write Off Cost Center,Írja Off Cost Center
-DocType: Warehouse,Warehouse Detail,Warehouse részlete
+DocType: Warehouse,Warehouse Detail,Raktár részletek
apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeret már átlépte az ügyfél {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},Ön nem jogosult hozzáadására és frissítésére bejegyzés előtt {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,"Szülőelem {0} nem lehet Stock tétel, és kell, hogy legyen Sales tétel"
DocType: Item,Item Image (if not slideshow),Elem Kép (ha nem slideshow)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Az Ügyfél már létezik ezen a néven
DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Órás sebesség / 60) * aktuális üzemidő
-DocType: SMS Log,SMS Log,SMS Belépés
+DocType: SMS Log,SMS Log,SMS napló
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Költségét a szállított tételek
DocType: Blog Post,Guest,Vendég
DocType: Quality Inspection,Get Specification Details,Get Specification Részletek
@@ -129,7 +129,7 @@
apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Anyagjegyzék
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},Re {0} {1}
DocType: Item,Copy From Item Group,Másolás jogcím-csoport
-DocType: Journal Entry,Opening Entry,Nyitó Entry
+DocType: Journal Entry,Opening Entry,Kezdő tétel
apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} kötelező
apps/erpnext/erpnext/config/setup.py +111,Contact master.,Kapcsolat mester.
apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Account with existing transaction can not be converted to group.,Véve a meglévő ügylet nem konvertálható csoportot.
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +35,Please select Company first,"Kérjük, válasszon Társaság első"
DocType: Employee Education,Under Graduate,Under Graduate
apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Cél On
-DocType: BOM,Total Cost,Total Cost
+DocType: BOM,Total Cost,Összköltség
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Reaming,Dörzsárazás
DocType: Email Digest,Stub,Tuskó
apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +8,Activity Log:,Tevékenység lista
@@ -148,20 +148,20 @@
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Statement of Account
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pharmaceuticals,Pharmaceuticals
DocType: Expense Claim Detail,Claim Amount,Követelés összege
-DocType: Employee,Mr,Mr
+DocType: Employee,Mr,Úr
DocType: Custom Script,Client,Ügyfél
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Szállító Type / szállító
DocType: Naming Series,Prefix,Előtag
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,Elhasználható
-DocType: Upload Attendance,Import Log,Import Bejelentkezés
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Küld
+DocType: Upload Attendance,Import Log,Importálás naplója
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Küldés
DocType: SMS Center,All Contact,Minden Kapcsolattartó
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Éves Fizetés
DocType: Period Closing Voucher,Closing Fiscal Year,Záró pénzügyi év
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock költségek
DocType: Newsletter,Email Sent?,Emailt elküldeni?
DocType: Journal Entry,Contra Entry,Contra Entry
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,Show Time Naplók
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,Időnaplók mutatása
DocType: Email Digest,Bank/Cash Balance,Bank / Cash Balance
DocType: Delivery Note,Installation Status,Telepítés állapota
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
@@ -173,9 +173,9 @@
DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Után felülvizsgálják Sales számla benyújtásának.
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","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Beállításait HR modul
-DocType: SMS Center,SMS Center,SMS Center
+DocType: SMS Center,SMS Center,SMS Központ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Straightening,Egyengető
-DocType: BOM Replace Tool,New BOM,Új BOM
+DocType: BOM Replace Tool,New BOM,Új anyagjegyzék
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +132,There were no updates in the items selected for this digest.,Nem voltak frissítések a kiválasztott tételek erre a kivonatot.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Countergravity casting,Ellennyomásos öntés
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +28,Newsletter has already been sent,Hírlevél még nem küldték
@@ -190,15 +190,15 @@
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dátum belül kell pénzügyi évben. Feltételezve A Date = {0}
DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Válassza ki a munkavállaló, akit alkotsz az értékelésre."
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +90,Cost Center {0} does not belong to Company {1},Költséghely {0} nem tartozik Company {1}
-DocType: Customer,Individual,Egyéni
+DocType: Customer,Individual,Magánszemély
apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Tervet karbantartási ellenőrzés.
DocType: SMS Settings,Enter url parameter for message,Adja url paraméter üzenet
apps/erpnext/erpnext/config/selling.py +143,Rules for applying pricing and discount.,Alkalmazási szabályainak árképzés és kedvezmény.
apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Árlista kell alkalmazni vétele vagy eladása
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},A telepítés időpontja nem lehet korábbi szállítási határidő jogcím {0}
-sites/assets/js/form.min.js +261,Start,Kezdet
-DocType: User,First Name,First Name
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,A beállítás kész. Frissítő.
+sites/assets/js/form.min.js +261,Start,Start
+DocType: User,First Name,Vezetéknév
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,A telepítésnek vége. Frissítés...
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Full-mold casting,Full-olvadéköntési
DocType: Offer Letter,Select Terms and Conditions,Válassza ki Feltételek
DocType: Email Digest,Payments made during the digest period,Alatt teljesített kifizetések Digest időszakban
@@ -208,7 +208,7 @@
,Purchase Order Trends,Megrendelés Trends
apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Osztja levelek évre.
DocType: Earning Type,Earning Type,Kereset típusa
-DocType: Email Digest,New Sales Orders,Új értékesítési rendelések
+DocType: Email Digest,New Sales Orders,Új értékesítési rendelés
DocType: Bank Reconciliation,Bank Account,Bankszámla
DocType: Leave Type,Allow Negative Balance,Negatív egyenleg engedélyezése
DocType: Email Digest,Receivable / Payable account will be identified based on the field Master Type,Követelések / kötelezettségek figyelembe fogja azonosítani alapján a területen Mester Type
@@ -219,19 +219,19 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} does not belong to Company {1},Account {0} nem tartozik Company {1}
DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},Fenntartva Warehouse szükséges Stock tétel {0} sorban {1}
-DocType: Sales Invoice,Is Opening Entry,Nyit Entry
+DocType: Sales Invoice,Is Opening Entry,Ez nyitó tétel?
DocType: Supplier,Mention if non-standard receivable account applicable,"Beszélve, ha nem szabványos követelés véve az alkalmazandó"
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,"Raktár van szükség, mielőtt beküldése"
DocType: Sales Partner,Reseller,Viszonteladó
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,"Kérjük, adja Társaság"
DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési számlák Elem
-,Production Orders in Progress,Termelési úton lévő
+,Production Orders in Progress,Folyamatban lévő gyártási rendelések
DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,"Auto-emelés Material kérése, ha mennyisége eléri az újra, hogy szinten alapértelmezett raktárban"
DocType: Journal Entry,Write Off Amount <=,Írja egyszeri összeg <=
DocType: Lead,Address & Contact,Cím és Kapcsolattartó
apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},Next Ismétlődő {0} jön létre {1}
DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,"Hozzon létre Stock Ledger bejegyzés, ha be értékesítés számlája"
-DocType: Newsletter List,Total Subscribers,Összesen előfizetők
+DocType: Newsletter List,Total Subscribers,Összes előfizető
DocType: Lead,Contact Name,Kapcsolattartó neve
DocType: Production Plan Item,SO Pending Qty,SO Folyamatban Mennyiség
DocType: Salary Manager,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
@@ -248,7 +248,7 @@
DocType: Brand,Material Master Manager,Anyag mester menedzser
DocType: Bulk Email,Message,Üzenet
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +663,Pending Items {0} updated,Függőben lévő elemek {0} frissített
-DocType: Item Website Specification,Item Website Specification,Elem Weboldal Specification
+DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
DocType: Backup Manager,Dropbox Access Key,Dropbox Access Key
DocType: Payment Tool,Reference No,Hivatkozási szám
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +342,Leave Blocked,Hagyja Blokkolt
@@ -257,37 +257,37 @@
DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
DocType: Purchase Invoice,In Words will be visible once you save the Purchase Invoice.,"A szavak lesz látható, ha menteni a vásárlást igazoló számlát."
DocType: Stock Entry,Sales Invoice No,Értékesítési számlák No
-DocType: Material Request Item,Min Order Qty,Min legújabb árak
+DocType: Material Request Item,Min Order Qty,Min. rendelési menny.
DocType: Lead,Do Not Contact,Ne írj
DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Az egyedi azonosítóval nyomon követi az összes visszatérő számlákat. Úgy keletkezett benyújtani.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Software Developer,Software Developer
DocType: Item,Minimum Order Qty,Minimális rendelési menny
-DocType: Pricing Rule,Supplier Type,Szállító Type
+DocType: Pricing Rule,Supplier Type,Beszállító típusa
DocType: Item,Publish in Hub,Közzéteszi Hub
-,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +482,Item {0} is cancelled,Elem {0} törölték
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Material Request,Anyag kérése
+,Terretory,Terület
+apps/erpnext/erpnext/stock/doctype/item/item.py +482,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Material Request,Anyagigénylés
DocType: Bank Reconciliation,Update Clearance Date,Frissítés Végső dátum
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Wire brushing,Drótkeféléshez
DocType: Employee,Relation,Kapcsolat
apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Visszaigazolt megrendelések ügyfelektől.
DocType: Purchase Receipt Item,Rejected Quantity,Elutasított mennyiség
DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Helytelenül elérhető szállítólevél, árajánlat, Értékesítési számlák, Értékesítési rendelés"
-DocType: SMS Settings,SMS Sender Name,SMS Sender Name
+DocType: SMS Settings,SMS Sender Name,SMS küldő neve
DocType: Contact,Is Primary Contact,Az elsődleges Kapcsolat
DocType: Notification Control,Notification Control,Notification vezérlés
DocType: Lead,Suggestions,Javaslatok
DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set tétel Group-bölcs költségvetés azon a területen. Akkor is a szezonalitás beállításával Distribution.
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Kérjük, adja szülő fiókcsoportot raktári {0}"
DocType: Supplier,Address HTML,HTML Cím
-DocType: Lead,Mobile No.,Mobile No.
-DocType: Maintenance Schedule,Generate Schedule,Létrehoz Menetrend
+DocType: Lead,Mobile No.,Mobiltelefon
+DocType: Maintenance Schedule,Generate Schedule,Ütemezés generálása
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Hubbing,Hubbing
DocType: Purchase Invoice Item,Expense Head,Igénylés fejléce
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Kérjük, válasszon Charge Type első"
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Legutolsó
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,Max 5 characters,Max 5 karakter
-DocType: Email Digest,New Quotations,Új Idézetek
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,Max 5 characters,Max. 5 karakter
+DocType: Email Digest,New Quotations,Új árajánlat
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +194,Select Your Language,Nyelvválasztás
DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első Leave Jóváhagyó a lista lesz-e az alapértelmezett Leave Jóváhagyó
DocType: Accounts Settings,Settings for Accounts,Beállításait Accounts
@@ -298,7 +298,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint ""Menny a Manufacture"""
DocType: DocType,Administrator,Adminisztrátor
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser drilling,Lézerfúrással
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
+DocType: Stock UOM Replace Utility,New Stock UOM,Új készlet mértékegysége
DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője
DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> hozzáadása / szerkesztése </a>"
DocType: Employee,External Work History,Külső munka története
@@ -321,11 +321,11 @@
DocType: Sales Order Item,Reserved Warehouse,Fenntartva Warehouse
apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
-DocType: Workstation,Rent Cost,Rent költség
+DocType: Workstation,Rent Cost,Bérleti díj
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,"Kérjük, válasszon hónapot és évet"
DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Vesszővel elválasztva kell felsorolni az emailcímeket, ahova a számla automatikusan elküldésre kerül az adott időpontban"
DocType: Employee,Company Email,Cég E-mail
-DocType: Workflow State,Refresh,Felüdít
+DocType: Workflow State,Refresh,Frissítés
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.","Minden behozatali kapcsolódó területeken, mint valuta átváltási arányok, import teljes, import végösszeg stb állnak rendelkezésre a vásárláskor kapott nyugtát, Szállító Idézet, vásárlást igazoló számlát, megrendelés, stb"
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,"Ez a tétel az a sablon, és nem lehet használni a tranzakciók. Elem attribútumok fognak kerülnek át a változatok, kivéve, ha ""No Copy"" van beállítva"
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +59,Total Order Considered,Teljes Megrendelés Tekinthető
@@ -354,11 +354,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,Vízsugaras vágás
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,Beállítás Már Komplett !!
,Finished Goods,Készáru
-DocType: Delivery Note,Instructions,Utasítás
-DocType: Quality Inspection,Inspected By,Ellenőriztesse
-DocType: Maintenance Visit,Maintenance Type,Karbantartás Type
+DocType: Delivery Note,Instructions,Utasítások
+DocType: Quality Inspection,Inspected By,Megvizsgálta
+DocType: Maintenance Visit,Maintenance Type,Karbantartás típusa
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nem tartozik szállítólevél {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Elem Minőség-ellenőrzési Paraméter
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Anyag minőségi vizsgálatának részletei
DocType: Leave Application,Leave Approver Name,Hagyja Jóváhagyó név
,Schedule Date,Menetrend dátuma
DocType: Packed Item,Packed Item,Csomagolt Elem
@@ -366,9 +366,9 @@
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Tevékenység Költség létezik Employee {0} elleni tevékenység típusa - {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.,"Kérjük, ne hozzon létre ügyfélszámlák és beszállítók. Ők jönnek létre közvetlenül a vevői / szállítói mesterek."
DocType: Currency Exchange,Currency Exchange,Valuta árfolyam
-DocType: Purchase Invoice Item,Item Name,Elem neve
+DocType: Purchase Invoice Item,Item Name,Az elem neve
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
-DocType: Employee,Widowed,Megözvegyült
+DocType: Employee,Widowed,Özvegy
DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Tételek kért, amelyek ""Elfogyott"" figyelembe véve az összes raktárak alapján tervezett Menny és a minimális rendelési mennyiség"
DocType: Workstation,Working Hours,Munkaidő
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszám egy meglévő sorozatban.
@@ -381,23 +381,23 @@
DocType: Workstation,Consumable Cost,Fogyó költség
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Orvosi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Oka vesztes
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Veszteség indoka
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Cső gyöngyfűzés
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban per Nyaralás listája: {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +638,Make Maint. Schedule,Tedd Karba. Menetrend
-DocType: Employee,Single,Egyetlen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +638,Make Maint. Schedule,Karbant. ütemezés készítése
+DocType: Employee,Single,Egyedülálló
DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési
DocType: Purchase Invoice,Yearly,Évi
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +217,Please enter Cost Center,"Kérjük, adja Cost Center"
-DocType: Sales Invoice Item,Sales Order,Vevői
+DocType: Sales Invoice Item,Sales Order,Értékesítési megrendelés
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Átlagos eladási ráta
DocType: Purchase Order,Start date of current order's period,Kezdje napját az aktuális rendelés időszaka
apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},Mennyiség nem lehet egy frakciót sorában {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és Rate
+DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és ár
DocType: Delivery Note,% Installed,% telepítve
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,Kérjük adja meg a cégnevet első
-DocType: BOM,Item Desription,Elem leírás még megemlítheti
-DocType: Buying Settings,Supplier Name,Szállító neve
+DocType: BOM,Item Desription,Az anyag leírása
+DocType: Buying Settings,Supplier Name,Beszállító neve
DocType: Account,Is Group,Is Csoport
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Thermoforming
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Slitting
@@ -405,13 +405,13 @@
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,Nem kezdődött
DocType: Lead,Channel Partner,Értékesítési partner
-DocType: Account,Old Parent,Régi Parent
+DocType: Account,Old Parent,Régi szülő
DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Megszokott a bevezető szöveget, amely megy, mint egy része az e-mail. Minden egyes tranzakció külön bevezető szöveget."
DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales mester menedzser
apps/erpnext/erpnext/config/manufacturing.py +66,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamat.
DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
-DocType: SMS Log,Sent On,Elküldött On
-DocType: Sales Order,Not Applicable,Nem alkalmazható
+DocType: SMS Log,Sent On,Elküldve
+DocType: Sales Order,Not Applicable,Nem értelmezhető
apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Nyaralás mester.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Shell molding,Héjformázás
DocType: Material Request Item,Required Date,Szükséges dátuma
@@ -421,16 +421,16 @@
DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ha be van jelölve, az adó összegét kell tekinteni, mint amelyek már szerepelnek a Print Ár / Print Összeg"
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
DocType: Employee,Health Concerns,Egészségügyi aggodalmak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Unpaid,Kifizetetlen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Unpaid,Fizetetlen
DocType: Packing Slip,From Package No.,Re csomag No.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
-DocType: Features Setup,Imports,Behozatal
+DocType: Features Setup,Imports,Importálások
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,Ragasztás
DocType: Job Opening,Description of a Job Opening,Leírása egy Állásajánlatok
apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Részvételi rekord.
-DocType: Bank Reconciliation,Journal Entries,Naplóbejegyzések
+DocType: Bank Reconciliation,Journal Entries,Könyvelési tételek
DocType: Sales Order Item,Used for Production Plan,Használt termelési terv
-DocType: System Settings,Loading...,Loading ...
+DocType: System Settings,Loading...,Betöltés...
DocType: DocField,Password,Jelszó
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Fused deposition modeling,Olvasztott leválasztás modellezés
DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (percben)
@@ -439,9 +439,9 @@
DocType: Journal Entry,Accounts Payable,Fizethető számlák
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Add előfizetők
sites/assets/js/erpnext.min.js +2,""" does not exists","""Nem létezik"
-DocType: Pricing Rule,Valid Upto,Érvényes Upto
+DocType: Pricing Rule,Valid Upto,Érvényes eddig:
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
-DocType: Email Digest,Open Tickets,Nyitott Jegyek
+DocType: Email Digest,Open Tickets,Nyitott jegyek
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Közvetlen jövedelemtámogatás
DocType: Email Digest,Total amount of invoices received from suppliers during the digest period,Teljes összege érkező számlák beszállítók között az Digest időszakban
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,"Can not filter based on Account, if grouped by Account","Nem tudja kiszűrni alapján Account, ha csoportosítva Account"
@@ -456,23 +456,23 @@
DocType: DocField,Type,Típus
apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
DocType: Backup Manager,Email ids separated by commas.,E-mail azonosítók vesszővel elválasztva.
-DocType: Communication,Subject,Téma
+DocType: Communication,Subject,Tárgy
DocType: Item,"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Válassza ki az ""Igen"", ha ez a tétel valami munkát, mint a képzés, tervezés, tanácsadás stb"
DocType: Shipping Rule,Net Weight,Nettó súly
DocType: Employee,Emergency Phone,Sürgősségi telefon
DocType: Backup Manager,Google Drive Access Allowed,Google Drive Access hozhatja
-,Serial No Warranty Expiry,Serial No Garancia Lejárat
+,Serial No Warranty Expiry,Sorozatszám garanciaidő lejárta
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +634,Do you really want to STOP this Material Request?,Tényleg azt akarja állítani ezt a Material kérése?
DocType: Purchase Invoice Item,Item,Tétel
DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
DocType: Account,Profit and Loss,Eredménykimutatás
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +310,Upcoming Calendar Events (max 10),Közelgő naptár (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,Új UOM TILOS típusú egész szám
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Bútor és állványt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Bútor és állvány
DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Arány, amely Árlista valuta konvertálja a vállalkozás székhelyén pénznemben"
apps/erpnext/erpnext/setup/doctype/company/company.py +48,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
DocType: Selling Settings,Default Customer Group,Alapértelmezett Vásárlói csoport
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha disable, ""lekerekített Total"" mezőben nem lesz látható semmilyen tranzakcióban"
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha kikapcsolod, a 'Kerekített összesen' mező nem fog látszódni sehol sem"
DocType: BOM,Operating Cost,A működési költségek
,Gross Profit,Bruttó nyereség
DocType: Production Planning Tool,Material Requirement,Anyagszükséglet
@@ -480,48 +480,48 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,Elem {0} nem Purchase Elem
apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
Email Address'","{0} nem érvényes email címet 'Notification \ Email Address """
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Összesen Számlázási ebben az évben:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ebben az évben számlázva:
DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
-DocType: Purchase Invoice,Supplier Invoice No,Szállító Számla No
+DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
DocType: Territory,For reference,Referenciaként
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),Zárás (Cr)
DocType: Serial No,Warranty Period (Days),Garancia idő (nap)
DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
-DocType: Job Applicant,Thread HTML,Menet HTML
-DocType: Company,Ignore,Figyelmen kívül hagy
+DocType: Job Applicant,Thread HTML,HTML szál
+DocType: Company,Ignore,Mellőz
DocType: Backup Manager,Enter Verification Code,Írja be a képen látható kód
apps/erpnext/erpnext/controllers/buying_controller.py +136,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Szállító Warehouse kötelező alvállalkozóknak vásárlási nyugta
-DocType: Pricing Rule,Valid From,Érvényes:
+DocType: Pricing Rule,Valid From,Érvényes innentől:
DocType: Sales Invoice,Total Commission,Teljes Bizottság
-DocType: Pricing Rule,Sales Partner,Értékesítési Partner
+DocType: Pricing Rule,Sales Partner,Értékesítő partner
DocType: Buying Settings,Purchase Receipt Required,Vásárlási Kötelező átvételi
DocType: Monthly Distribution,"**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**","** A havi elosztási ** segít terjeszteni a költségvetési egész hónapban, ha a szezonalitás a te dolgod. Terjeszteni a költségvetési ezzel a forgalmazás, állítsa ezt ** havi megoszlása ** a ** Cost Center **"
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
-apps/erpnext/erpnext/config/accounts.py +79,Financial / accounting year.,Pénzügyi / számviteli évben.
+apps/erpnext/erpnext/config/accounts.py +79,Financial / accounting year.,Pénzügyi / számviteli év.
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +172,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Serial Nos nem lehet összevonni,"
-DocType: Email Digest,New Supplier Quotations,Új Beszállító idézetek
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,Tedd Vevői
+DocType: Email Digest,New Supplier Quotations,Új beszállítói ajánlat
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,Értékesítési megrendelés készítése
DocType: Project Task,Project Task,Projekt feladat
-,Lead Id,Lead Id
+,Lead Id,Célpont ID
DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
DocType: About Us Settings,Website Manager,Weboldal menedzser
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Pénzügyi év kezdő dátuma nem lehet nagyobb, mint a pénzügyi év vége dátum"
-DocType: Warranty Claim,Resolution,Felbontás
+DocType: Warranty Claim,Resolution,Megoldás
DocType: Sales Order,Display all the individual items delivered with the main items,Mindent megjeleníteni az egyes tételek szállított a főbb tételek
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +67,Payable Account,Fizetendő számla
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlóid
DocType: Backup Manager,Sync with Google Drive,Szinkronizálni Google Drive
DocType: Leave Control Panel,Allocate,Osztja
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Előző
-DocType: Stock Entry,Sales Return,Értékesítési Return
+DocType: Stock Entry,Sales Return,Eladás visszaküldése
DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Válassza ki Vevőmegrendelés ahonnan szeretne létrehozni gyártási megrendeléseket.
apps/erpnext/erpnext/config/hr.py +120,Salary components.,Fizetés alkatrészeket.
apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Adatbázist a potenciális vásárlók.
apps/erpnext/erpnext/config/crm.py +17,Customer database.,Vevői adatbázis.
-DocType: Quotation,Quotation To,Idézet To
+DocType: Quotation,Quotation To,Árajánlat az ő részére
DocType: Lead,Middle Income,Közepes jövedelmű
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
apps/erpnext/erpnext/accounts/utils.py +186,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
@@ -534,18 +534,18 @@
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +197,Production Order is Mandatory,Termelési rend Kötelező
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +40,{0} {1} has a common territory {2},{0} {1} van egy közös területe {2}
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Proposal Writing,Pályázatírás
-apps/erpnext/erpnext/config/setup.py +85,Masters,Masters
+apps/erpnext/erpnext/config/setup.py +85,Masters,Fő adatok
apps/erpnext/erpnext/stock/stock_ledger.py +316,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatív Stock Error ({6}) jogcím {0} Warehouse {1} a {2} {3} {4} {5}
-DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Társaság
+DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
DocType: Packing Slip Item,DN Detail,DN részlete
DocType: Time Log,Billed,Kiszámlázzák
DocType: Batch,Batch Description,Köteg leírás
DocType: Delivery Note,Time at which items were delivered from warehouse,Időpontja tételek szállítottak a raktárból
-DocType: Sales Invoice,Sales Taxes and Charges,Értékesítési adók és illetékek
-DocType: Employee,Organization Profile,Szervezet Profil
+DocType: Sales Invoice,Sales Taxes and Charges,Értékesítési adók és költségek
+DocType: Employee,Organization Profile,Szervezet profilja
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,"Kérjük, beállítási számozás sorozat Jelenléti a Setup> számozás Series"
-DocType: Email Digest,New Enquiries,Új Enquiries
-DocType: Employee,Reason for Resignation,Ok lemondása
+DocType: Email Digest,New Enquiries,Új érdeklődés
+DocType: Employee,Reason for Resignation,Felmondás indoka
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Sablon a teljesítménymérés.
DocType: Payment Reconciliation,Invoice/Journal Entry Details,Számla / Naplókönyvelés Részletek
apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},"{0} ""{1}"" nem pénzügyi évben {2}"
@@ -562,11 +562,11 @@
DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Az 'és' Group By"" nem lehet ugyanazon"
DocType: Sales Person,Sales Person Targets,Értékesítői célok
-sites/assets/js/form.min.js +253,To,Hogy
-apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Kérjük, adja email címét"
+sites/assets/js/form.min.js +253,To,eddig
+apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,Emailcím megadása
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,End tube forming,Vége csőformázó
DocType: Production Order Operation,In minutes,Perceken
-DocType: Issue,Resolution Date,Felbontás dátuma
+DocType: Issue,Resolution Date,Megoldás dátuma
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
DocType: Selling Settings,Customer Naming By,Vásárlói Elnevezése a
apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Átalakítás Group
@@ -575,21 +575,21 @@
DocType: Sales Invoice,Packing List,Csomagolási lista
apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Megrendelések beszállítóknak.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Publishing,Kiadás
-DocType: Activity Cost,Projects User,Projektek Felhasználó
+DocType: Activity Cost,Projects User,Projekt felhasználó
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Fogyasztott
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
-DocType: Material Request,Material Transfer,Material Transfer
+DocType: Material Request,Material Transfer,Anyag átrakása
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Megnyitó (Dr.)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Posting timestamp must be after {0},"Kiküldetés timestamp kell lennie, miután {0}"
apps/frappe/frappe/config/setup.py +59,Settings,Beállítások
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Beszerzési költség adók és illetékek
DocType: Production Order Operation,Actual Start Time,Tényleges kezdési idő
DocType: BOM Operation,Operation Time,Működési idő
-sites/assets/js/list.min.js +5,More,Több
+sites/assets/js/list.min.js +5,More,Tovább
DocType: Communication,Sales Manager,Sales Manager
-sites/assets/js/desk.min.js +555,Rename,Átnevezése
-DocType: Purchase Invoice,Write Off Amount,Írja egyszeri összeg
+sites/assets/js/desk.min.js +555,Rename,Átnevezés
+DocType: Purchase Invoice,Write Off Amount,Leírt összeg
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Bending,Hajlítás
DocType: Leave Block List Allow,Allow User,Felhasználó engedélyezése
DocType: Journal Entry,Bill No,Bill No
@@ -599,7 +599,7 @@
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,"Kérjük, adja Gift"
DocType: Purchase Receipt,Other Details,Egyéb részletek
DocType: Account,Accounts,Könyvelés
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,Értékesítés
+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,Egyenes nyíró
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.,Hogy nyomon tétel az értékesítési és beszerzési dokumentumok alapján soros nos. Ez is használják a pálya garanciális részleteket a termék.
DocType: Purchase Receipt Item Supplied,Current Stock,Raktárkészlet
@@ -607,23 +607,23 @@
DocType: Account,Expenses Included In Valuation,Költségekből Értékelési
DocType: Employee,Provide email id registered in company,Adjon email id bejegyzett cég
DocType: Hub Settings,Seller City,Eladó város
-DocType: Email Digest,Next email will be sent on:,Next e-mailt küldünk on:
+DocType: Email Digest,Next email will be sent on:,A következő emailt küldjük:
DocType: Offer Letter Term,Offer Letter Term,Ajánlat Letter Term
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +23,Item {0} not found,Elem {0} nem található
-DocType: Bin,Stock Value,Stock Érték
+DocType: Bin,Stock Value,Készlet értéke
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Fa Típus
DocType: BOM Explosion Item,Qty Consumed Per Unit,Mennyiség Consumed Per Unit
-DocType: Serial No,Warranty Expiry Date,Garancia Lejárat dátuma
+DocType: Serial No,Warranty Expiry Date,Garancia lejárati dátuma
DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
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","Ellen utalvány típus közül kell Sales Order, eladást igazoló számla vagy Naplókönyvelés"
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,Légtér
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Fogadtatás
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Üdv
DocType: Journal Entry,Credit Card Entry,Hitelkártya Entry
apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Feladat Téma
apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Áruk szállítóktól kapott.
-DocType: Communication,Open,Nyílt
+DocType: Communication,Open,Megnyitva
DocType: Lead,Campaign Name,Kampány neve
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +197,Please enter Delivery Note No or Sales Invoice No to proceed,"Kérjük, adja szállítólevél Nem vagy Értékesítési számlák No folytatáshoz"
,Reserved,Fenntartott
@@ -645,7 +645,7 @@
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +139,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Energy,Energia
-DocType: Opportunity,Opportunity From,Lehetőség A
+DocType: Opportunity,Opportunity From,Lehetőség tőle
apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Havi kimutatást.
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}. \
Pending Amount is {2}","Row {0}: Az összeg nem lehet nagyobb, mint a függőben összeget ad költségelszámolás benyújtás {1}. \ Függőben Összeg {2}"
@@ -685,7 +685,7 @@
DocType: Serial No,Purchase Returned,Vásárlási Visszaküldött
DocType: Employee,Bank A/C No.,Bank A / C No.
DocType: Email Digest,Scheduler Failed Events,Scheduler sikertelen események
-DocType: Expense Claim,Project,Program
+DocType: Expense Claim,Project,Projekt
DocType: Quality Inspection Reading,Reading 7,Olvasás 7
DocType: Address,Personal,Személyes
DocType: Expense Claim Detail,Expense Claim Type,Béremelési igény típusa
@@ -699,20 +699,20 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összege nem lehet nagyobb, mint igény összegéből sorában {0}."
DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
apps/erpnext/erpnext/stock/get_item_details.py +238,Price List not selected,Árlista nincs kiválasztva
-DocType: Employee,Family Background,Családi háttere
+DocType: Employee,Family Background,Családi háttér
DocType: Salary Manager,Send Email,E-mail küldése
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,Nincs engedély
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,Nincs jogosultság
DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first","Kiszűrni alapuló párt, válasszuk a párt Írja első"
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,Nos
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Megbékélés részlete
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,Saját számlák
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Egyetlen dolgozó sem találtam
-DocType: Purchase Order,Stopped,Megállt
+DocType: Purchase Order,Stopped,Megállítva
DocType: SMS Center,All Customer Contact,Minden vevői Kapcsolattartó
apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Töltsd fel készletének egyenlege keresztül csv.
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +32,Send Now,Küldés most
-,Support Analytics,Támogatás Analytics
+,Support Analytics,Támogatási analitika
DocType: Item,Website Warehouse,Weboldal Warehouse
DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto számla jön létre pl 05, 28 stb"
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,"Pontszám kell lennie, kisebb vagy egyenlő, mint 5"
@@ -722,19 +722,19 @@
DocType: Bin,Moving Average Rate,Mozgóátlag
DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
-DocType: Communication,Reference Name,Referencia név
+DocType: Communication,Reference Name,Hivatkozott tétel
DocType: Maintenance Visit,Completion Status,Készültségi állapot
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","Hogy nyomon márkanév a következő dokumentumokat szállítólevél, Opportunity, Material Request pont, Megrendelés, vásárlás utalvány, vásárlója átvétele, idézet, Értékesítési számlák, Sales BOM, Sales Order, Serial No"
-DocType: Production Order,Target Warehouse,Cél Warehouse
+DocType: Production Order,Target Warehouse,Cél raktár
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,A Várható szállítás dátuma nem lehet korábbi mint a rendelés dátuma
DocType: Upload Attendance,Import Attendance,Import Nézőszám
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
DocType: Salary Manager,Activity Log,Tevékenység
apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettó nyereség / veszteség
apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Automatikusan üzenet írása benyújtása tranzakciókat.
-DocType: Production Order,Item To Manufacture,Elem gyártani
+DocType: Production Order,Item To Manufacture,Anyag gyártáshoz
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,Állandó olvadéköntési
-DocType: Sales Order Item,Projected Qty,Vetített Mennyiség
+DocType: Sales Order Item,Projected Qty,Tervezett mennyiség
DocType: Sales Invoice,Payment Due Date,Fizetési határidő
DocType: Newsletter,Newsletter Manager,Hírlevél menedzser
DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
@@ -743,16 +743,16 @@
DocType: Appraisal,Select template from which you want to get the Goals,"Válassza ki a sablont, amely azt szeretné, hogy a célok"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Research & Development,Kutatás és fejlesztés
,Amount to Bill,Összeget számlázni
-DocType: Company,Registration Details,Regisztrációs Részletek
+DocType: Company,Registration Details,Regisztrációs adatok
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,Kockára
DocType: Item Reorder,Re-Order Qty,Re-Order Mennyiség
DocType: Leave Block List Date,Leave Block List Date,Hagyja Block List dátuma
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +23,Scheduled to send to {0},Ütemezett küldeni a {0}
-DocType: Pricing Rule,Price or Discount,Ár vagy Kedvezmény
+DocType: Pricing Rule,Price or Discount,Árazás vagy engedmény
DocType: Sales Team,Incentives,Ösztönzők
apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Teljesítményértékelési rendszer.
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Érték
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +636,Make Maint. Visit,Tedd Karba. Látogatás
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt érték
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +636,Make Maint. Visit,Karbant. látogatás készítése
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +68,Cannot carry forward {0},Nem lehet tovább folytatni {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'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
DocType: Account,Balance must be,Egyensúlyt kell
@@ -769,14 +769,14 @@
DocType: HR Settings,Include holidays in Total no. of Working Days,Közé ünnepek Total no. munkanapok
DocType: Job Applicant,Hold,Tart
DocType: Employee,Date of Joining,Belépés dátuma
-DocType: Naming Series,Update Series,Frissítés Series
-DocType: Supplier Quotation,Is Subcontracted,Alvállalkozói
+DocType: Naming Series,Update Series,Sorszámozás frissítése
+DocType: Supplier Quotation,Is Subcontracted,Alvállalkozó által feldolgozandó?
DocType: Item Attribute,Item Attribute Values,Elem attribútum-értékekben
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Kilátás előfizetők
DocType: Purchase Invoice Item,Purchase Receipt,Vásárlási nyugta
,Received Items To Be Billed,Kapott elemek is fizetnie kell
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Abrasive blasting,Szemcseszórás
-DocType: Employee,Ms,Ms
+DocType: Employee,Ms,Hölgy
apps/erpnext/erpnext/config/accounts.py +138,Currency exchange rate master.,Devizaárfolyam mester.
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +242,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
DocType: Production Order,Plan material for sub-assemblies,Terv anyagot részegységekre
@@ -788,7 +788,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to Item {1},Serial No {0} nem tartozik Elem {1}
apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Setting,Szerezz új POS Setting
DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
-DocType: Bank Reconciliation,Total Amount,Teljes összeg
+DocType: Bank Reconciliation,Total Amount,Összesen
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Internet Publishing,Internet Publishing
DocType: Production Planning Tool,Production Orders,Gyártási rendelések
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,Balance Érték
@@ -797,7 +797,7 @@
DocType: Purchase Receipt,Range,Tartomány
DocType: Supplier,Default Payable Accounts,Alapértelmezett fizetendő számlák
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employee {0} nem aktív, vagy nem létezik"
-DocType: Features Setup,Item Barcode,Elem Vonalkód
+DocType: Features Setup,Item Barcode,Elem vonalkódja
apps/erpnext/erpnext/stock/doctype/item/item.py +193,Item Variants {0} updated,Elem változatok {0} frissített
DocType: Quality Inspection Reading,Reading 6,Olvasás 6
DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vásárlást igazoló számlát Advance
@@ -810,7 +810,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,A Brand
apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
DocType: Employee,Exit Interview Details,Kilépési interjú részletei
-DocType: Item,Is Purchase Item,Vásárolnia Elem
+DocType: Item,Is Purchase Item,Beszerzendő tétel?
DocType: Payment Reconciliation Payment,Purchase Invoice,Vásárlási számla
DocType: Stock Ledger Entry,Voucher Detail No,Utalvány Részlet No
DocType: Stock Entry,Total Outgoing Value,Összes kimenő Érték
@@ -819,7 +819,7 @@
DocType: Salary Slip,Total in words,Összesen szavakban
DocType: Material Request Item,Lead Time Date,Átfutási idő dátuma
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +127,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Kérem adjon meg Serial No jogcím {1}
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Szállítások ügyfelek.
+apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Kiszállítás a vevő felé.
DocType: Purchase Invoice Item,Purchase Order Item,Megrendelés Termék
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Közvetett jövedelem
DocType: Contact Us Settings,Address Line 1,1. cím sor
@@ -838,33 +838,33 @@
DocType: Workstation,Electricity Cost,Villamosenergia-költség
DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön dolgozói születésnapi emlékeztetőt
DocType: Comment,Unsubscribed,Leiratkozott
-DocType: Opportunity,Walk In,Walk In
-DocType: Item,Inspection Criteria,Ellenőrzési szempontok
+DocType: Opportunity,Walk In,Utcáról
+DocType: Item,Inspection Criteria,Vizsgálati szempontok
apps/erpnext/erpnext/config/accounts.py +96,Tree of finanial Cost Centers.,Tree of finanial költség központok.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +472,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később).
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,White,Fehér
DocType: SMS Center,All Lead (Open),Minden Lead (Open)
-DocType: Purchase Invoice,Get Advances Paid,Get kifizetett előlegek
+DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Picture,Arcképed csatolása
DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
-DocType: Workflow State,Stop,Stop
+DocType: Workflow State,Stop,Megáll
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.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
DocType: Purchase Order,% of materials billed against this Purchase Order.,% -a Anyagok számlázott ellen Megrendelés.
apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Megrendelni típusa közül kell {0}
-DocType: Lead,Next Contact Date,Next Kapcsolat dátuma
+DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +34,Opening Qty,Nyitva Mennyiség
-DocType: Holiday List,Holiday List Name,Nyaralás Listanév
+DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +163,Stock Options,Stock Options
DocType: Expense Claim,Expense Claim,Béremelési igény
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +164,Qty for {0},Mennyiség: {0}
-DocType: Leave Application,Leave Application,Szabadság Application
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Hagyja Kiosztási eszköz
+DocType: Leave Application,Leave Application,Szabadságok
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Szabadság Lefoglaló Eszköz
DocType: Leave Block List,Leave Block List Dates,Hagyja Block List dátuma
DocType: Email Digest,Buying & Selling,Beszerzés és eladás
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Trimming,Trimmelés
DocType: Workstation,Net Hour Rate,Net órás sebesség
DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Beszerzési költség vásárlási nyugta
-DocType: Packing Slip Item,Packing Slip Item,Csomagolás szelvényen Elem
+DocType: Packing Slip Item,Packing Slip Item,Csomagjegy tétel
DocType: POS Setting,Cash/Bank Account,Cash / Bank Account
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
DocType: Delivery Note,Delivery To,Szállítás az
@@ -892,13 +892,13 @@
DocType: Item,Manufacturer,Gyártó
DocType: Landed Cost Item,Purchase Receipt Item,Vásárlási nyugta Elem
DocType: Sales Order,PO Date,PO dátuma
-DocType: Serial No,Sales Returned,Értékesítési Visszatért
+DocType: Serial No,Sales Returned,Visszaküldött eladás
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Fenntartva Warehouse Sales Order / készáru raktárba
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Ajánló Összeg
-apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,Time Naplók
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Értékesítési összeg
+apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,Idő naplók
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,"Te vagy a költség Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
DocType: Serial No,Creation Document No,Creation Document No
-DocType: Issue,Issue,Kérdés
+DocType: Issue,Issue,Probléma
apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribútumait tétel változatok. pl méret, szín stb"
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},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
@@ -910,13 +910,13 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,Normál vásárlás
DocType: GL Entry,Against,Ellen
DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
-DocType: Sales Partner,Implementation Partner,Végrehajtása Partner
+DocType: Sales Partner,Implementation Partner,Kivitelező partner
DocType: Purchase Invoice,Contact Info,Kapcsolattartó infó
-DocType: Packing Slip,Net Weight UOM,Nettó súly UOM
+DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Make Purchase Receipt,Tedd vásárlási nyugta
DocType: Item,Default Supplier,Alapértelmezett beszállító
-DocType: Shipping Rule Condition,Shipping Rule Condition,Szállítási szabály állapota
-DocType: Features Setup,Miscelleneous,Miscelleneous
+DocType: Shipping Rule Condition,Shipping Rule Condition,Szállítás feltételei
+DocType: Features Setup,Miscelleneous,Egyéb
DocType: Holiday List,Get Weekly Off Dates,Get Off Heti dátuma
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"A befejezés dátuma nem lehet kevesebb, mint a Start Date"
DocType: Sales Person,Select company name first.,Válassza ki a cég nevét először.
@@ -934,12 +934,12 @@
DocType: Supplier,Default Currency,Alapértelmezett pénznem
DocType: Contact,Enter designation of this Contact,Adja kijelölése ennek Kapcsolat
DocType: Contact Us Settings,Address,Cím
-DocType: Expense Claim,From Employee,A munkavállalói
+DocType: Expense Claim,From Employee,Dolgozótól
apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} semmilyen pénzügyi évben. További részletekért nézd {2}.
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
-DocType: Journal Entry,Make Difference Entry,Tedd különbség Entry
+DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
DocType: Upload Attendance,Attendance From Date,Jelenléti Dátum
-DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
+DocType: Appraisal Template Goal,Key Performance Area,Teljesítménymutató terület
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,Szállítás
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} kell benyújtani
DocType: SMS Center,Total Characters,Összesen karakterek
@@ -954,23 +954,23 @@
DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Kosár Szállítási szabály
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +53,Budget cannot be set for Group Cost Centers,Költségvetést nem lehet beállítani Group Cost Centers
-,Ordered Items To Be Billed,Megrendelt tételeket is fizetnie kell
+,Ordered Items To Be Billed,Rendelt mennyiség számlázásra
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Válassza ki a Time Naplók és elküldése hogy hozzon létre egy új Értékesítési számlák.
-DocType: Global Defaults,Global Defaults,Global Alapértékek
+DocType: Global Defaults,Global Defaults,Általános beállítások
DocType: Salary Slip,Deductions,Levonások
DocType: Purchase Invoice,Start date of current invoice's period,Kezdési időpont az aktuális számla időszaka
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ezúttal Bejelentkezés Batch már kiszámlázott.
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ez az Időnapló gyűjtő ki lett számlázva.
apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Hozzon létre Opportunity
DocType: Salary Slip,Leave Without Pay,Fizetés nélküli szabadságon
DocType: Supplier,Communications,Távközlés
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Kapacitás tervezés Error
DocType: Lead,Consultant,Szaktanácsadó
DocType: Salary Slip,Earnings,Keresetek
-DocType: Sales Invoice Advance,Sales Invoice Advance,Értékesítési számlák Advance
+DocType: Sales Invoice Advance,Sales Invoice Advance,Értékesítési számla előleg
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Nincs kérni
apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',"""Tényleges kezdési dátum"" nem lehet nagyobb, mint a ""Tényleges End Date"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,Vezetés
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Típusú tevékenységek jelenléti ívek
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Az Időtáblában szereplő tevékenységek típusai
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Befektetési öntés
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +45,Either debit or credit amount is required for {0},Vagy terhelés és jóváírás összegét szükséges {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""","Ez lesz fűzve az Item Code a variáns. Például, ha a rövidítés ""SM"", és az elem kód ""T-shirt"", a cikk-kód a variáns lesz ""feliratú pólót-SM"""
@@ -978,7 +978,7 @@
apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktív
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Kék
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,"További csomópontok csak alatt létrehozott ""csoport"" típusú csomópontot"
-DocType: Item,UOMs,UOMs
+DocType: Item,UOMs,Mértékegységek
apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámot, nos jogcím {1}"
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Tételkód nem lehet megváltoztatni a Serial No.
DocType: Purchase Order Item,UOM Conversion Factor,UOM konverziós tényező
@@ -991,7 +991,7 @@
DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Az értékesítési személy kap egy emlékeztető Ezen a napon a kapcsolatot az ügyféllel,"
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","További számlák tehető alatt csoportjai, de bejegyzéseket lehet tenni ellene nem Csoportok"
apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Adó és egyéb levonások fizetést.
-DocType: Lead,Lead,Lead
+DocType: Lead,Lead,Célpont
DocType: Email Digest,Payables,Kötelezettségek
DocType: Account,Warehouse,Raktár
,Purchase Order Items To Be Billed,Megrendelés elemek is fizetnie kell
@@ -999,11 +999,11 @@
DocType: Backup Manager,Database Folder ID,Adatbázis Folder ID
DocType: Purchase Invoice Item,Purchase Invoice Item,Vásárlási számla tétel
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,Stock Ledger bejegyzések és GL A bejegyzések újra meghirdeti a kiválasztott vásárlás nyugtáinak
-DocType: Holiday,Holiday,Ünnep
+DocType: Holiday,Holiday,Szabadnap
DocType: Event,Saturday,Szombat
DocType: Leave Control Panel,Leave blank if considered for all branches,"Hagyja üresen, ha figyelembe minden ágát"
,Daily Time Log Summary,Napi időnapló összesítő
-DocType: DocField,Label,Címke
+DocType: DocField,Label,Felirat
DocType: Payment Reconciliation,Unreconciled Payment Details,Nem egyeztetett fizetési részletek
DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
@@ -1014,9 +1014,9 @@
sites/assets/js/erpnext.min.js +2,"Grid ""","Grid """
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +145,Please select prefix first,"Kérjük, válasszon prefix első"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Research,Kutatás
-DocType: Maintenance Visit Purpose,Work Done,Elvégzett munka
+DocType: Maintenance Visit Purpose,Work Done,Kész a munka
DocType: Employee,User ID,Felhasználó ID
-DocType: Communication,Sent,Küldött
+DocType: Communication,Sent,Elküldött
apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Kilátás Ledger
DocType: Cost Center,Lft,Lft
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
@@ -1026,26 +1026,26 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,A világ többi része
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,A tétel {0} nem lehet Batch
,Budget Variance Report,Költségkeret Variance jelentés
-DocType: Salary Slip,Gross Pay,Bruttó Pay
+DocType: Salary Slip,Gross Pay,Bruttó fizetés
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Az osztalék,"
DocType: Stock Reconciliation,Difference Amount,Eltérés összege
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Eredménytartalék
DocType: Purchase Order,Required raw materials issued to the supplier for producing a sub - contracted item.,Szükséges alapanyagok kiállították a szállítóval előállítására sub - szerződött elemet.
-DocType: BOM Item,Item Description,Elem Leírás
+DocType: BOM Item,Item Description,Az anyag leírása
DocType: Payment Tool,Payment Mode,Fizetési mód
DocType: Purchase Invoice,Is Recurring,Ismétlődő
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,Direct metal laser sintering,Közvetlen fém lézeres szinterezés
DocType: Purchase Order,Supplied Items,A mellékelt tartozékok
-DocType: Production Order,Qty To Manufacture,Mennyiség gyártani
+DocType: Production Order,Qty To Manufacture,Menny. gyártáshoz
DocType: Buying Settings,Maintain same rate throughout purchase cycle,Fenntartani azonos ütemben egész vásárlási ciklus
-DocType: Opportunity Item,Opportunity Item,Lehetőség Elem
+DocType: Opportunity Item,Opportunity Item,Lehetőség tétel
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ideiglenes megnyitását
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
,Employee Leave Balance,Munkavállalói Leave Balance
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
DocType: Sales Invoice,More Info,További információk
DocType: Address,Address Type,Cím típusa
-DocType: Purchase Receipt,Rejected Warehouse,Elutasított Warehouse
+DocType: Purchase Receipt,Rejected Warehouse,Elutasított raktár
DocType: GL Entry,Against Voucher,Ellen utalvány
DocType: Item,Default Buying Cost Center,Alapértelmezett Vásárlási Cost Center
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,Elem {0} kell Sales Elem
@@ -1053,7 +1053,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
DocType: Journal Entry,Get Outstanding Invoices,Get kiváló számlák
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Vevői {0} nem érvényes
-DocType: Email Digest,New Stock Entries,New Stock bejegyzések
+DocType: Email Digest,New Stock Entries,Új készlet bejegyzés
apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,Kis
DocType: Employee,Employee Number,Munkavállalói száma
@@ -1064,7 +1064,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Green,Zöld
DocType: Sales Order Item,Discount(%),Kedvezmény (%)
apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Összesen Elért
-DocType: Employee,Place of Issue,Kiállítás helye
+DocType: Employee,Place of Issue,Probléma helye
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +54,Contract,Szerződés
DocType: Report,Disabled,Tiltva
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +523,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
@@ -1075,12 +1075,12 @@
DocType: Mode of Payment,Mode of Payment,Fizetési mód
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoportban, és nem lehet szerkeszteni."
DocType: Purchase Invoice Item,Purchase Order,Megrendelés
-DocType: Warehouse,Warehouse Contact Info,Warehouse Elérhetőség
+DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
sites/assets/js/form.min.js +180,Name is required,Névre van szükség
-DocType: Purchase Invoice,Recurring Type,Ismétlődő Type
+DocType: Purchase Invoice,Recurring Type,Gyakoriság
DocType: Address,City/Town,Város/település
-DocType: Serial No,Serial No Details,Serial No Részletek
-DocType: Purchase Invoice Item,Item Tax Rate,Elem Tax Rate
+DocType: Serial No,Serial No Details,Sorozatszám adatai
+DocType: Purchase Invoice Item,Item Tax Rate,Az anyag adójának mértéke
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
apps/erpnext/erpnext/stock/get_item_details.py +137,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
@@ -1101,10 +1101,10 @@
DocType: Sales Taxes and Charges Template,Valid For Territories,Érvényes Területek
DocType: Item,Website Item Groups,Weboldal Elem Csoportok
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Production order number is mandatory for stock entry purpose manufacture,Gyártási rendelési szám kötelező készletnövekedést célú gyártás
-DocType: Purchase Invoice,Total (Company Currency),Összesen (Társaság Currency)
+DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
DocType: Applicable Territory,Applicable Territory,Alkalmazható Terület
apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Sorozatszámot {0} belépett többször
-DocType: Journal Entry,Journal Entry,Naplókönyvelés
+DocType: Journal Entry,Journal Entry,Könyvelési tétel
DocType: Workstation,Workstation Name,Munkaállomás neve
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,Összefoglaló email:
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
@@ -1116,12 +1116,12 @@
DocType: Quality Inspection Reading,Reading 8,Reading 8
DocType: Sales Partner,Agent,Ügynök
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'","Összesen {0} minden példány nulla, akkor meg kell változtatni "Osszuk alapuló díjak""
-DocType: Purchase Invoice,Taxes and Charges Calculation,Adók és díjak kiszámítása
-DocType: BOM Operation,Workstation,Workstation
+DocType: Purchase Invoice,Taxes and Charges Calculation,Adók és költségek számítása
+DocType: BOM Operation,Workstation,Munkaállomás
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +107,Hardware,Hardver
DocType: Attendance,HR Manager,HR menedzser
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +47,Privilege Leave,Privilege Leave
-DocType: Purchase Invoice,Supplier Invoice Date,Szállító Számla dátuma
+DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +169,You need to enable Shopping Cart,Akkor engedélyezze a kosárba
sites/assets/js/form.min.js +197,No Data,Nincs adat
DocType: Appraisal Template Goal,Appraisal Template Goal,Teljesítmény értékelő sablon célja
@@ -1137,17 +1137,17 @@
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +127,You can make a time log only against a submitted production order,"Tudod, hogy egy időben csak naplózás ellen benyújtott produkciós sorrendben"
DocType: Maintenance Schedule Item,No of Visits,Nem a látogatások
DocType: Cost Center,old_parent,old_parent
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Hírlevelet kapcsolatok, vezet."
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Hírlevelek kapcsolatoknak, vezetőknek"
apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Pontjainak összegeként az összes célokat kell 100. {0}
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +368,Operations cannot be left blank.,Műveletek nem maradt üresen.
,Delivered Items To Be Billed,Kiszállított anyag számlázásra
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Raktár nem lehet megváltoztatni a Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +99,Status updated to {0},Állapota frissült {0}
DocType: DocField,Description,Leírás
DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
DocType: Backup Manager,Backup Manager,Mentés kezelő
DocType: Letter Head,Is Default,Default
-DocType: Address,Utilities,Utilities
+DocType: Address,Utilities,Segédletek
DocType: Purchase Invoice Item,Accounting,Könyvelés
DocType: Features Setup,Features Setup,Funkciók beállítása
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ajánlat megtekintése Letter
@@ -1167,35 +1167,35 @@
DocType: Sales Invoice,Sales BOM Help,Értékesítési BOM Súgó
DocType: Purchase Invoice,Contact Person,Kapcsolattartó személy
apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"""Várható indulás dátuma"" nem lehet nagyobb, mint a ""Várható befejezés dátuma"""
-DocType: Holiday List,Holidays,Ünnepek
+DocType: Holiday List,Holidays,Szabadnapok
DocType: Sales Order Item,Planned Quantity,Tervezett mennyiség
-DocType: Purchase Invoice Item,Item Tax Amount,Elem Adó összege
+DocType: Purchase Invoice Item,Item Tax Amount,Az anyag adójának értéke
DocType: Supplier Quotation,Get Terms and Conditions,Get Általános Szerződési Feltételek
DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés"
apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza 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,Re Datetime
-DocType: Email Digest,For Company,A Társaság
+DocType: Email Digest,For Company,A Társaságnak
apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikációs napló.
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Vásárlási összeg
DocType: Sales Invoice,Shipping Address Name,Szállítási cím Név
apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Számlatükör
-DocType: Material Request,Terms and Conditions Content,Feltételek Content
+DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +506,cannot be greater than 100,"nem lehet nagyobb, mint 100"
DocType: Purchase Receipt Item,Discount %,% kedvezmény
apps/erpnext/erpnext/stock/doctype/item/item.py +473,Item {0} is not a stock Item,Elem {0} nem Stock tétel
-DocType: Maintenance Visit,Unscheduled,Nem betervezett
-DocType: Employee,Owned,Tulajdonú
+DocType: Maintenance Visit,Unscheduled,Nem tervezett
+DocType: Employee,Owned,Tulaj
DocType: Pricing Rule,"Higher the number, higher the priority","Minél nagyobb a szám, annál nagyobb a prioritás"
,Purchase Invoice Trends,Vásárlást igazoló számlát Trends
DocType: Employee,Better Prospects,Jobb kilátásokat
DocType: Appraisal,Goals,Célok
-DocType: Warranty Claim,Warranty / AMC Status,Garancia / AMC állapota
+DocType: Warranty Claim,Warranty / AMC Status,Garancia és éves karbantartási szerződés állapota
,Accounts Browser,Számlák Browser
DocType: GL Entry,GL Entry,GL Entry
DocType: HR Settings,Employee Settings,Munkavállalói beállítások
,Batch-Wise Balance History,Szakaszos Balance History
-DocType: Email Digest,To Do List,To Do List
+DocType: Email Digest,To Do List,Tennivalók listája
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Apprentice,Ipari tanuló
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1209,25 +1209,25 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +578,We buy this Item,Vásárolunk ezt a tárgyat
DocType: Address,Billing,Számlázás
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Nem Elküldött
+DocType: Bulk Email,Not Sent,Nincs elküldve
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Explosive forming,Robbanásveszélyes képező
DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Összesen adók és illetékek (Társaság Currency)
-DocType: Shipping Rule,Shipping Account,Szállítási Account
+DocType: Shipping Rule,Shipping Account,Szállítási számla
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +41,Scheduled to send to {0} recipients,Ütemezett küldeni a {0} címzettek
DocType: Quality Inspection,Readings,Olvasmányok
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Sub Assemblies,Részegységek
DocType: Shipping Rule Condition,To Value,Hogy Érték
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
-DocType: Packing Slip,Packing Slip,Csomagolás szelvényen
+DocType: Packing Slip,Packing Slip,Csomagjegy
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
apps/erpnext/erpnext/config/setup.py +80,Setup SMS gateway settings,Beállítás SMS gateway beállítások
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,Az importálás nem sikerült!
sites/assets/js/erpnext.min.js +19,No address added yet.,Nem címre hozzá még.
-DocType: Workstation Working Hour,Workstation Working Hour,Workstation munkaidő
+DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Elemző
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},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
DocType: Item,Inventory,Leltár
-DocType: Item,Sales Details,Értékesítési Részletek
+DocType: Item,Sales Details,Értékesítés részletei
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Pinning,Pinning
DocType: Opportunity,With Items,A tételek
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,In Qty,A Menny
@@ -1247,13 +1247,13 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +403,Financial Year Start Date,Pénzügyi év kezdő dátuma
DocType: Employee External Work History,Total Experience,Összesen Experience
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Countersinking,Süllyesztés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packing Slip(s) cancelled,Csomagolási Slip (ek) lemondás
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak
DocType: Material Request Item,Sales Order No,Sales Order No
-DocType: Item Group,Item Group Name,Elem Group Name
+DocType: Item Group,Item Group Name,Anyagcsoport neve
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +47,Taken,Taken
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +63,Transfer Materials for Manufacture,Transfer anyagok gyártása
-DocType: Pricing Rule,For Price List,Árlista
+DocType: Pricing Rule,For Price List,Ezen árlistán
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.","Vételi árfolyamon a tétel: {0} nem található, ami szükséges könyv könyvelési tételt (ráfordítás). Kérjük beszélve tétel ára ellen felvásárlási árlistát."
DocType: Maintenance Schedule,Schedules,Menetrendek
@@ -1262,17 +1262,17 @@
DocType: Period Closing Voucher,CoA Help,CoA Súgó
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +533,Error: {0} > {1},Hiba: {0}> {1}
apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Kérjük, hozzon létre új fiókot a számlatükör."
-DocType: Maintenance Visit,Maintenance Visit,Karbantartás látogatás
+DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Vásárló > Vásárlói csoport > Terület
DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Elérhető Batch Mennyiség a Warehouse
-DocType: Time Log Batch Detail,Time Log Batch Detail,Idő Bejelentkezés Batch részlete
+DocType: Time Log Batch Detail,Time Log Batch Detail,Időnapló gyűjtő adatai
DocType: Workflow State,Tasks,Feladatok
DocType: Landed Cost Voucher,Landed Cost Help,Beszerzési költség Súgó
DocType: Event,Tuesday,Kedd
DocType: Leave Block List,Block Holidays on important days.,Blokk Holidays fontos napokon.
,Accounts Receivable Summary,VEVÔKÖVETELÉSEK Összefoglaló
apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa User ID mező alkalmazotti rekordot beállítani Employee szerepe"
-DocType: UOM,UOM Name,UOM név
+DocType: UOM,UOM Name,Mértékegység neve
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,A támogatás mértéke
DocType: Sales Invoice,Shipping Address,Szállítási cím
@@ -1286,14 +1286,14 @@
DocType: Monthly Distribution,Monthly Distribution,Havi Distribution
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +66,Receiver List is empty. Please create Receiver List,"Vevő lista üres. Kérjük, hozzon létre Receiver listája"
DocType: Production Plan Sales Order,Production Plan Sales Order,Gyártási terv Vevői
-DocType: Sales Partner,Sales Partner Target,Értékesítési Partner Cél
+DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
DocType: Pricing Rule,Pricing Rule,Árképzési szabály
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Notching,Kivágó
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +44,Reserved warehouse required for stock item {0},Fenntartva raktárban szükséges állomány elem {0}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
,Bank Reconciliation Statement,Bank Megbékélés nyilatkozat
-DocType: Address,Lead Name,Lead név
-,POS,POS
+DocType: Address,Lead Name,Célpont neve
+,POS,Értékesítési hely (POS)
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0} kell csak egyszer jelenik meg
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},A levelek foglalás sikeres {0}
@@ -1308,7 +1308,7 @@
DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +227,Task is Mandatory if Time Log is against a project,"Feladat kötelező, ha idő Napló ellen projekt"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Források
-DocType: Purchase Receipt,Supplier Warehouse,Szállító Warehouse
+DocType: Purchase Receipt,Supplier Warehouse,Beszállító raktára
DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
DocType: Production Planning Tool,Select Sales Orders,Válassza ki Vevőmegrendelés
,Material Requests for which Supplier Quotations are not created,"Anyag kérelmek, amelyek esetében Szállító idézetek nem jönnek létre"
@@ -1330,7 +1330,7 @@
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Költsége Kiadott elemek
DocType: Email Digest,Expenses Booked,Költségek foglalás
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +168,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
-DocType: Quotation Item,Quotation Item,Idézet Elem
+DocType: Quotation Item,Quotation Item,Árajánlat tétele
DocType: Account,Account Name,Számla név
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} mennyiséget nem lehet egy töredéke
@@ -1339,7 +1339,7 @@
apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,Hozzáadás
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Conversion rate cannot be 0 or 1,Konverziós arány nem lehet 0 vagy 1
DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Delivery Note,Vehicle Dispatch Date,Jármű Dispatch dátuma
+DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,"Feladat kötelező, ha Költség állítást ellen Project"
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
@@ -1349,11 +1349,11 @@
apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% számlázott
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,Reserved Mennyiség
DocType: Party Account,Party Account,Párt Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Emberi Erőforrások
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Emberi erőforrások
DocType: Lead,Upper Income,Felső jövedelmi
apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,Saját kérdések
DocType: BOM Item,BOM Item,Anyagjegyzék tétel
-DocType: Appraisal,For Employee,Munkavállalói
+DocType: Appraisal,For Employee,Dolgozónak
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,Row {0}: Fizetés összege nem lehet negatív
DocType: Expense Claim,Total Amount Reimbursed,Megtérített teljes összeg
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,Présidomba
@@ -1367,19 +1367,19 @@
,Customer Credit Balance,Customer Credit Balance
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Vásárlói szükséges ""Customerwise Discount"""
apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Frissítse bank fizetési időpontokat folyóiratokkal.
-DocType: Quotation,Term Details,Term Részletek
+DocType: Quotation,Term Details,ÁSZF részletek
DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitás tervezés Az (nap)
DocType: Warranty Claim,Warranty Claim,Jótállási igény
-,Lead Details,Lead Részletek
+,Lead Details,Célpont adatai
DocType: Authorization Rule,Approving User,Jóváhagyó Felhasználó
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Forging,Kovácsolás
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Plating,Galvanizálás
DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszaka
DocType: Pricing Rule,Applicable For,Alkalmazható
-DocType: Bank Reconciliation,From Date,Dátum
+DocType: Bank Reconciliation,From Date,Dátumtól
DocType: Backup Manager,Validate,Érvényesít
DocType: Maintenance Visit,Partially Completed,Részben befejezett
-DocType: Sales Invoice,Packed Items,Csomagolt elemek
+DocType: Sales Invoice,Packed Items,Csomag tételei
apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garancia szembeni követelés Serial No.
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","Cserélje egy adott BOM minden más Darabjegyzékeket, ahol alkalmazzák. Ez váltja fel a régi BOM link, frissítse költség és regenerálja ""BOM Robbanás tétel"" tábla, mint egy új BOM"
DocType: Shopping Cart Settings,Enable Shopping Cart,Bevásárló kosár engedélyezése
@@ -1388,7 +1388,7 @@
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +158,Please select item code,"Kérjük, jelölje ki az elemet kódot"
DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Csökkentse levonás fizetés nélküli szabadságon (LWP)
DocType: Territory,Territory Manager,Területi igazgató
-DocType: Selling Settings,Selling Settings,Ajánló Beállítások
+DocType: Selling Settings,Selling Settings,Értékesítés beállításai
apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,Elemet nem lehet egy változata egy variáns
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Online Auctions,Online aukciók
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg sem mennyiség vagy Értékelési Rate, vagy mindkettő"
@@ -1398,30 +1398,30 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +208,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyaga Request használják e Stock Entry
DocType: Journal Entry,View Details,Részletek
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Egységének egy elemet.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +160,Time Log Batch {0} must be 'Submitted',"Idő Bejelentkezés Batch {0} kell ""Beküldte"""
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Egy darab anyag.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +160,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tedd számviteli könyvelése minden Készletmozgás
-DocType: Leave Allocation,Total Leaves Allocated,Összesen Leaves Lekötött
+DocType: Leave Allocation,Total Leaves Allocated,Összes lekötött szabadság
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},Warehouse szükség Row {0}
DocType: Employee,Date Of Retirement,A nyugdíjazás
DocType: Upload Attendance,Get Template,Get Template
DocType: Address,Postal,Postai
DocType: Email Digest,Total amount of invoices sent to the customer during the digest period,Teljes összegét a számlákat küldött az ügyfélnek alatt Digest időszakban
-DocType: Item,Weightage,Weightage
+DocType: Item,Weightage,Súlyozás
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Mining,Bányászati
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Resin casting,Gyanta casting
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,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport"
DocType: Territory,Parent Territory,Szülő Terület
DocType: Quality Inspection Reading,Reading 2,Reading 2
-DocType: Stock Entry,Material Receipt,Bevétjegy
+DocType: Stock Entry,Material Receipt,Anyag bevételezése
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +570,Products,Termékek
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +41,Party Type and Party is required for Receivable / Payable account {0},Párt típusa és fél köteles a követelések / kötelezettségek figyelembe {0}
DocType: Lead,Next Contact By,Next Kapcsolat
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Quantity required for Item {0} in row {1},Szükséges mennyiséget tétel {0} sorban {1}
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} nem lehet törölni, mint a mennyiség létezik tétel {1}"
DocType: Quotation,Order Type,Rendelés típusa
-DocType: Purchase Invoice,Notification Email Address,Notification E-mail cím
-DocType: Payment Tool,Find Invoices to Match,Keresse számlák Match
+DocType: Purchase Invoice,Notification Email Address,Értesítendő emailcímek
+DocType: Payment Tool,Find Invoices to Match,Számlák keresése egyezésig
,Item-wise Sales Register,Elem-bölcs Sales Regisztráció
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","pl. ""XYZ Nemzeti Bank"""
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez adó az árban Basic Rate?
@@ -1443,12 +1443,12 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +31,Opportunity From field is mandatory,Lehetőség A mező kitöltése kötelező
DocType: Sales Invoice,Considered as an Opening Balance,Minősül Nyitó egyenleg
DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,Tedd Megrendelés
-DocType: SMS Center,Send To,Küldje el
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,Beszerzési rendelés készítése
+DocType: SMS Center,Send To,Címzett
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
DocType: Sales Team,Contribution to Net Total,Hozzájárulás a Net Total
DocType: Sales Invoice Item,Customer's Item Code,Vevő cikkszáma
-DocType: Stock Reconciliation,Stock Reconciliation,Stock Megbékélés
+DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
DocType: Territory,Territory Name,Terület neve
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,"Work in progress Warehouse van szükség, mielőtt beküldése"
apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kérelmező a munkát.
@@ -1468,11 +1468,11 @@
DocType: Item,Apply Warehouse-wise Reorder Level,Alkalmazni Warehouse-bölcs Reorder Level
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,BOM {0} kell benyújtani
DocType: Authorization Control,Authorization Control,Felhatalmazásvezérlés
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Idő Bejelentkezés a feladatokat.
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,A feladatok időnaplói.
DocType: Production Order Operation,Actual Time and Cost,Tényleges idő és költség
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},Anyag kérésére legfeljebb {0} tehető jogcím {1} ellen Vevői {2}
-DocType: Employee,Salutation,Köszöntés
-DocType: Offer Letter,Rejected,Elutasított
+DocType: Employee,Salutation,Megszólítás
+DocType: Offer Letter,Rejected,Elutasítva
DocType: Pricing Rule,Brand,Márka
DocType: Item,Will also apply for variants,Kell alkalmazni a változatok
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,% kiszállítva
@@ -1489,7 +1489,7 @@
apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Lejárt
DocType: Packing Slip,To Package No.,A csomag No.
DocType: DocType,System,Rendszer
-DocType: Warranty Claim,Issue Date,Megjelenés dátuma
+DocType: Warranty Claim,Issue Date,Probléma dátuma
DocType: Activity Cost,Activity Cost,Activity költség
DocType: Purchase Receipt Item Supplied,Consumed Qty,Fogyasztott Mennyiség
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Távközlési
@@ -1501,13 +1501,13 @@
DocType: Leave Application,Apply / Approve Leaves,Jelentkezés / jóváhagyása Leaves
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',"Utalhat sorban csak akkor, ha a vád típus ""On előző sor Összeg"" vagy ""Előző Row Összesen"""
DocType: Item,Allowance Percent,Juttatás Percent
-DocType: SMS Settings,Message Parameter,Message Paraméter
+DocType: SMS Settings,Message Parameter,Üzenet paraméter
DocType: Serial No,Delivery Document No,Szállítási Document No
DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hogy elemeket vásárlása bevételek
DocType: Serial No,Creation Date,Létrehozás dátuma
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +34,Item {0} appears multiple times in Price List {1},Elem {0} többször is előfordul a árjegyzéke {1}
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ajánló ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Szállító Idézet Elem
+DocType: Purchase Order Item,Supplier Quotation Item,Beszállítói ajánlat tétel
apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Tedd bérszerkeztet
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Shearing,Nyírás
DocType: Item,Has Variants,Van-e változatok
@@ -1522,17 +1522,17 @@
than Outstanding Amount {2}","Fizetési ellen {0} {1} nem lehet nagyobb, \ mint fennálló összeg {2}"
DocType: Backup Manager,Dropbox Access Secret,Dropbox Access Secret
DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
-DocType: Item,Net Weight of each Item,Nettó súly az egyes tételek
+DocType: Item,Net Weight of each Item,Az egyes tételek nettó súlya
DocType: Supplier,Supplier of Goods or Services.,Szállító az áruk vagy szolgáltatások.
-DocType: Budget Detail,Fiscal Year,Költségvetési év
+DocType: Budget Detail,Fiscal Year,Pénzügyi év
DocType: Cost Center,Budget,Költségkeret
apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Elért
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Terület / Ügyfélszolgálat
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Terület / Ügyfél
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,e.g. 5,pl. 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}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,A szavak lesz látható mentése után a kereskedelmi számla.
-DocType: Item,Is Sales Item,Az értékesítési pont
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Elem Group Fa
+DocType: Item,Is Sales Item,Eladható tétel?
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Elem {0} nem beállítás Serial Nos. Ellenőrizze tétel mester
DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
,Amount to Deliver,Összeget Deliver
@@ -1543,12 +1543,12 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},"Elemsablon nem lehet Készlet és varaiants. Kérjük, távolítsa el az állománynak a raktárak {0}"
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} létrehozva
DocType: Journal Entry Account,Against Sales Order,Ellen Vevői
-,Serial No Status,Serial No állapota
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Elem tábla nem lehet üres
+,Serial No Status,Sorozatszám állapota
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Az Anyagok rész nem lehet üres
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,"Row {0}: To set {1} periodicity, difference between from and to date \
must be greater than or equal to {2}","Row {0}: beállítása {1} periodicitás, különbség a, és a mai napig \ nagyobbnak kell lennie, vagy egyenlő, mint {2}"
-DocType: Pricing Rule,Selling,Eladási
-DocType: Employee,Salary Information,Fizetés információ
+DocType: Pricing Rule,Selling,Értékesítés
+DocType: Employee,Salary Information,Bérinformáció
DocType: Sales Person,Name and Employee ID,Neve és dolgozói azonosító
apps/erpnext/erpnext/accounts/party.py +186,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
DocType: Website Item Group,Website Item Group,Weboldal Termék Csoport
@@ -1556,29 +1556,29 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +275,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Táblázat a tétel, amely megjelenik a Web Site"
DocType: Purchase Order Item Supplied,Supplied Qty,Mellékelt Mennyiség
-DocType: Material Request Item,Material Request Item,Anyag kérése Elem
+DocType: Material Request Item,Material Request Item,Anyagigénylés tétel
apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Fája Elem Csoportok.
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,"Nem lehet hivatkozni sor száma nagyobb vagy egyenlő, mint aktuális sor számát erre a Charge típusú"
,Item-wise Purchase History,Elem-bölcs Vásárlási előzmények
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Red,Piros
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +237,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
-DocType: Account,Frozen,Megfagyott
-,Open Production Orders,Nyílt gyártási rendelések
+DocType: Account,Frozen,Zárolt
+,Open Production Orders,Nyitott gyártási rendelések
DocType: Installation Note,Installation Time,Telepítési idő
apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,Törölje az összes tranzakciók erre Társaság
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} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Befektetések
-DocType: Issue,Resolution Details,Felbontás Részletek
+DocType: Issue,Resolution Details,Megoldás részletei
apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Megváltoztatni mértékegysége egy elemet.
DocType: Quality Inspection Reading,Acceptance Criteria,Elfogadási határ
DocType: Item Attribute,Attribute Name,Jellemző neve
apps/erpnext/erpnext/controllers/selling_controller.py +256,Item {0} must be Sales or Service Item in {1},Elem {0} kell lennie értékesítési vagy szolgáltatási tétel a {1}
-DocType: Item Group,Show In Website,Show Website
+DocType: Item Group,Show In Website,Weboldalon megjelenjen
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +569,Group,Csoport
DocType: Task,Expected Time (in hours),Várható idő (óra)
,Qty to Order,Mennyiség Rendelés
DocType: Sales Order,PO No,PO No
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt chart az összes feladatot.
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Minden feladat egy Gantt diagramon.
DocType: Appraisal,For Employee Name,Az alkalmazott neve
DocType: Holiday List,Clear Table,Tábla törlése
DocType: Features Setup,Brands,Márkák
@@ -1597,16 +1597,16 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Pár
DocType: Bank Reconciliation Detail,Against Account,Ellen számla
DocType: Maintenance Schedule Detail,Actual Date,Tényleges dátuma
-DocType: Item,Has Batch No,Van Batch No
+DocType: Item,Has Batch No,Lesz kötegszáma?
DocType: Delivery Note,Excise Page Number,Jövedéki Oldal száma
DocType: Employee,Personal Details,Személyes adatai
-,Maintenance Schedules,A karbantartás ütemezését
+,Maintenance Schedules,Karbantartási ütemezések
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Embossing,Domborító
,Quotation Trends,Idézet Trends
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,Item Group not mentioned in item master for item {0},Elem Csoport nem említett elem mestere jogcím {0}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.","Mivel a termelés Megrendelni lehet ezt az elemet, meg kell egy állomány elemet."
-DocType: Shipping Rule Condition,Shipping Amount,Szállítási Összeg
+DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,Összefogás
DocType: Authorization Rule,Above Value,Feletti érték
,Pending Amount,Függőben lévő összeg
@@ -1618,14 +1618,14 @@
,Supplier-Wise Sales Analytics,Beszállítói Wise Sales Analytics
DocType: Address Template,This format is used if country specific format is not found,"Ezt a formátumot használják, ha ország-specifikus formátumban nem található"
DocType: Custom Field,Custom,Egyedi
-DocType: Production Order,Use Multi-Level BOM,A Multi-Level BOM
+DocType: Production Order,Use Multi-Level BOM,Többszíntű anyagjegyzék
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Injection molding,Fröccsöntés
DocType: Bank Reconciliation,Include Reconciled Entries,Közé Egyeztetett bejegyzések
apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Fája finanial számlák.
DocType: Leave Control Panel,Leave blank if considered for all employee types,"Hagyja üresen, ha figyelembe munkavállalói típusok"
DocType: Landed Cost Voucher,Distribute Charges Based On,Terjesztheti alapuló díjak
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,"Account {0} típusú legyen ""Fixed Asset"" tételként {1} egy eszköz tétele"
-DocType: HR Settings,HR Settings,HR Beállítások
+DocType: HR Settings,HR Settings,Munkaügyi beállítások
apps/frappe/frappe/config/setup.py +130,Printing,Nyomtatás
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Költségén Követelés jóváhagyására vár. Csak a költség Jóváhagyó frissítheti állapotát.
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.,"A nap (ok) on, amelyre pályázik a szabadság ünnep. Nem kell alkalmazni a szabadság."
@@ -1637,7 +1637,7 @@
apps/erpnext/erpnext/templates/includes/cart.js +288,Something went wrong.,Valami rosszul sült el.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Unit,Egység
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +129,Please set Dropbox access keys in your site config,"Kérjük, állítsa Dropbox kisegítő billentyűk webhely config"
-apps/erpnext/erpnext/stock/get_item_details.py +114,Please specify Company,"Kérjük, adja Társaság"
+apps/erpnext/erpnext/stock/get_item_details.py +114,Please specify Company,Kérem adja meg a Cég nevét
,Customer Acquisition and Loyalty,Ügyfélszerzés és hűség
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,"From Time nem lehet nagyobb, mint a Time"
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Raktár, ahol fenntartják állomány visszautasított tételek"
@@ -1658,17 +1658,17 @@
DocType: Address Template,Address Template,Címlista sablon
DocType: Territory,Classification of Customers by region,Fogyasztói csoportosítás régiónként
DocType: Project,% Tasks Completed,% feladat elvégezve
-DocType: Project,Gross Margin,Bruttó Árrés
+DocType: Project,Gross Margin,Bruttó árrés
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Kérjük, adja Production pont első"
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,letiltott felhasználó
-DocType: Opportunity,Quotation,Idézet
+DocType: Opportunity,Quotation,Árajánlat
DocType: Salary Slip,Total Deduction,Összesen levonása
apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,"Hé! Megy előre, és adjunk hozzá egy címet"
DocType: Quotation,Maintenance User,Karbantartás Felhasználó
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Költség Frissítve
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,Biztosan meg szeretné kidugaszol
DocType: Employee,Date of Birth,Születési idő
-DocType: Salary Manager,Salary Manager,Fizetés menedzser
+DocType: Salary Manager,Salary Manager,Bér menedzser
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,Elem {0} már visszatért
DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** az adott pénzügyi évben. Minden könyvelési tétel, és más jelentős tranzakciókat nyomon elleni ** pénzügyi év **."
DocType: Opportunity,Customer / Lead Address,Vevő / Célpont címe
@@ -1695,8 +1695,8 @@
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Idő Log Status kell benyújtani.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +591,Setting Up,Beállítása
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +90,Make Debit Note,Tedd terhelési értesítés
-DocType: Purchase Invoice,In Words (Company Currency),Szavakban (Társaság Currency)
-DocType: Pricing Rule,Supplier,Szállító
+DocType: Purchase Invoice,In Words (Company Currency),Szavakkal (a cég valutanemében)
+DocType: Pricing Rule,Supplier,Beszállító
DocType: C-Form,Quarter,Negyed
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Egyéb ráfordítások
DocType: Global Defaults,Default Company,Alapértelmezett cég
@@ -1704,7 +1704,7 @@
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","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
DocType: Employee,Bank Name,Bank neve
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,Felhasználó {0} van tiltva
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,A(z) {0} felhasználó tiltva
DocType: Leave Application,Total Leave Days,Teljes szabadság napjait
DocType: Email Digest,Note: Email will not be sent to disabled users,Megjegyzés: E-mail nem lesz elküldve a fogyatékkal élő felhasználók számára
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Válassza ki Company ...
@@ -1717,11 +1717,11 @@
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +61,Last Sales Order Date,Utolsó Vevői rendelés dátuma
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +90,Sales Order required for Item {0},Vevői szükséges Elem {0}
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in system,Összegek nem tükröződik rendszer
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Társaság Currency)
+DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Egyéb
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Production might not be able to finish by the Expected Delivery Date.,Termelési esetleg nem tudja befejezni a szülés várható időpontja.
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +19,Set as Stopped,Állítsa Leállt
-DocType: POS Setting,Taxes and Charges,Adók és Illetékek
+DocType: POS Setting,Taxes and Charges,Adók és költségek
DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A termék vagy szolgáltatás, amelyet vásárolt, eladott vagy tartanak raktáron."
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,"Nem lehet kiválasztani a felelős típusú ""On előző sor Összeg"" vagy ""On előző sor Total"" az első sorban"
apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Befejezve
@@ -1729,8 +1729,8 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Broaching,Átvarratott
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Banking,Banking
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +48,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy menetrend"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +276,New Cost Center,Új Cost Center
-DocType: Bin,Ordered Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +276,New Cost Center,Új költségközpont
+DocType: Bin,Ordered Quantity,Rendelt mennyiség
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
DocType: Quality Inspection,In Process,In Process
DocType: Authorization Rule,Itemwise Discount,Itemwise Kedvezmény
@@ -1740,17 +1740,17 @@
DocType: Time Log Batch,Total Billing Amount,Összesen Számlázási összeg
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Követelések Account
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +140,No Updates For,Nem Frissítések
-,Stock Balance,Stock Balance
+,Stock Balance,Készlet egyenleg
DocType: Expense Claim Detail,Expense Claim Detail,Béremelés részlete
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +259,Time Logs created:,Time Naplók létre:
DocType: Company,If Yearly Budget Exceeded,Ha az éves költségvetés Meghaladta
-DocType: Item,Weight UOM,Súly UOM
+DocType: Item,Weight UOM,Súly mértékegysége
DocType: Employee,Blood Group,Vércsoport
-DocType: Purchase Invoice Item,Page Break,Oldaltörésre
-DocType: Production Order Operation,Pending,Függőben levő
+DocType: Purchase Invoice Item,Page Break,Oldaltörés
+DocType: Production Order Operation,Pending,Függő
DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"A felhasználók, akik engedélyt egy bizonyos munkavállalói szabadság alkalmazások"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Irodai berendezések
-DocType: Purchase Invoice Item,Qty,Mennyiség
+DocType: Purchase Invoice Item,Qty,Menny.
DocType: Fiscal Year,Companies,Cégek
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""","Számlák egyenlegét típusú ""Bank"" vagy ""Cash"""
@@ -1762,7 +1762,7 @@
DocType: Employee,Contact Details,Kapcsolattartó részletei
DocType: C-Form,Received Date,Kapott dátuma
DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ha már készítettünk egy szabványos sablon értékesítéshez kapcsolódó adók és díjak sablon, válasszon egyet és kattintson az alábbi gombra."
-DocType: Backup Manager,Upload Backups to Google Drive,Töltsd fel mentések a Google Drive
+DocType: Backup Manager,Upload Backups to Google Drive,Mentés feltöltése a Google Driveba
DocType: Stock Entry,Total Incoming Value,A bejövő Érték
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Vételár listája
DocType: Offer Letter Term,Offer Term,Ajánlat Term
@@ -1785,20 +1785,20 @@
apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,Árlista {0} van tiltva
DocType: Manufacturing Settings,Allow Overtime,Hagyjuk Túlóra
apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,Vevői {0} leáll
-DocType: Email Digest,New Leads,Új érdeklődők
+DocType: Email Digest,New Leads,Új potenciális vevő
DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Értékelés Rate
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,"Advance paid against {0} {1} cannot be greater \
than Grand Total {2}","A kifizetett előleg ellen {0} {1} nem lehet nagyobb, \ mint Grand Total {2}"
DocType: Opportunity,Lost Reason,Elveszett Reason
apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Hozzon létre Fizetési bejegyzés ellen megrendelések vagy számlák.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,Hegesztés
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,New Stock UOM van szükség
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,Új készlet mértékegységre szükség van
DocType: Quality Inspection,Sample Size,A minta mérete
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,Összes példány már kiszámlázott
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Kérem adjon meg egy érvényes 'A Case No. """
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,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
DocType: Project,External,Külső
-DocType: Features Setup,Item Serial Nos,Elem Serial Nos
+DocType: Features Setup,Item Serial Nos,Anyag-sorozatszámok
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +8,Not Received,Nem kapott
DocType: Branch,Branch,Ágazat
DocType: Sales Invoice,Customer (Receivable) Account,Ügyfél (Vevők) Account
@@ -1810,22 +1810,22 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +513,Your Customers,Az ügyfelek
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Compression molding,Sajtolóporokat
DocType: Leave Block List Date,Block Date,Blokk dátuma
-DocType: Sales Order,Not Delivered,Nem nyilvánított
+DocType: Sales Order,Not Delivered,Nem szállított
,Bank Clearance Summary,Bank Végső összefoglaló
apps/erpnext/erpnext/config/setup.py +75,"Create and manage daily, weekly and monthly email digests.","Hozhat létre napi, heti és havi e-mail digest."
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Tételkód> Elem Group> Brand
DocType: Appraisal Goal,Appraisal Goal,Teljesítmény értékelés célja
DocType: Event,Friday,Péntek
DocType: Time Log,Costing Amount,Költségszámítás Összeg
-DocType: Salary Manager,Submit Salary Slip,Submit Fizetés Slip
+DocType: Salary Manager,Submit Salary Slip,Bérlap küldés
DocType: Salary Structure,Monthly Earning & Deduction,Havi kereseti & levonása
apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm kedvezmény jogcím {0} {1}%
DocType: Supplier,Address & Contacts,Címek és Kapcsolattartók
-DocType: SMS Log,Sender Name,Sender Name
+DocType: SMS Log,Sender Name,Küldő neve
DocType: Page,Title,Cím
sites/assets/js/list.min.js +92,Customize,Testreszabás
DocType: POS Setting,[Select],[Válasszon]
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Tedd Értékesítési számlák
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Értékesítési számla készítése
DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Érvénytelen {0}: {1}
DocType: Sales Invoice Advance,Advance Amount,Előleg
@@ -1833,14 +1833,14 @@
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Dátumtól"" szükséges"
DocType: Journal Entry,Reference Number,Referencia szám
DocType: Employee,Employment Details,Foglalkoztatás részletei
-DocType: Employee,New Workplace,New Workplace
+DocType: Employee,New Workplace,Új munkahely
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Beállítás Zárt
apps/erpnext/erpnext/stock/get_item_details.py +104,No Item with Barcode {0},Egyetlen tétel Vonalkód {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case Nem. Nem lehet 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,"Ha értékesítési csapat és eladó Partners (Channel Partners) akkor kell jelölni, és megtartják hozzájárulást az értékesítési tevékenység"
DocType: Item,Show a slideshow at the top of the page,Mutass egy slideshow a lap tetején
apps/erpnext/erpnext/setup/doctype/company/company.py +71,Stores,Üzletek
-DocType: Time Log,Projects Manager,Projektek menedzser
+DocType: Time Log,Projects Manager,Projekt menedzser
DocType: Serial No,Delivery Time,Szállítási idő
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing alapszik
DocType: Item,End of Life,Felhasználhatósági idő
@@ -1850,18 +1850,18 @@
DocType: Purchase Order,Recurring,Ismétlődő
DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Kövesse nyomon külön bevételek és ráfordítások termék függőlegesek vagy körzetekre.
DocType: Rename Tool,Rename Tool,Átnevezési eszköz
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +11,Update Cost,Frissítés költség
-DocType: Item Reorder,Item Reorder,Elem Reorder
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +11,Update Cost,Költségek újraszámolása
+DocType: Item Reorder,Item Reorder,Anyag újrarendelés
DocType: Address,Check to make primary address,"Ellenőrizze, hogy elsődleges címet"
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +507,Transfer Material,Transfer anyag
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a működését, a működési költségek, és hogy egy egyedi Operation nem a műveleteket."
-DocType: Purchase Invoice,Price List Currency,Árlista Valuta
+DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
DocType: Naming Series,User must always select,Felhasználó mindig válassza
DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
DocType: Installation Note,Installation Note,Telepítési feljegyzés
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,Add Taxes,Add adók
-,Financial Analytics,Pénzügyi Analytics
-DocType: Quality Inspection,Verified By,Verified by
+,Financial Analytics,Pénzügyi analitika
+DocType: Quality Inspection,Verified By,Ellenőrizte
DocType: Address,Subsidiary,Leányvállalat
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.","Nem lehet megváltoztatni cég alapértelmezett valuta, mert már vannak tranzakciókat. Tranzakciók törölni kell változtatni az alapértelmezett pénznem."
DocType: Quality Inspection,Purchase Receipt No,Vásárlási nyugta nincs
@@ -1877,9 +1877,9 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} teljesen számlázott
DocType: Workstation Working Hour,End Time,End Time
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Az általános szerződési feltételek az értékesítési vagy megvásárolható.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,Csoport által utalvány
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,Utalvány által csoportosítva
apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
-DocType: Sales Invoice,Mass Mailing,Tömeges levelezést
+DocType: Sales Invoice,Mass Mailing,Tömeges email
DocType: Page,Standard,Standard
DocType: Rename Tool,File to Rename,Fájl átnevezése
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +175,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
@@ -1904,20 +1904,20 @@
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. egy kész jó pont
DocType: Upload Attendance,Attendance To Date,Részvétel a dátum
apps/erpnext/erpnext/config/selling.py +153,Setup incoming server for sales email id. (e.g. sales@example.com),Beállítás bejövő kiszolgáló értékesítési email id. (Pl sales@example.com)
-DocType: Warranty Claim,Raised By,Által felvetett
+DocType: Warranty Claim,Raised By,Felvetette
DocType: Payment Tool,Payment Account,Fizetési számla
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +725,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +14,Google Drive,Google Drive
sites/assets/js/list.min.js +22,Draft,Vázlat
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +45,Compensatory Off,Kompenzációs Off
DocType: Quality Inspection Reading,Accepted,Elfogadva
-DocType: User,Female,Női
+DocType: User,Female,Nő
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.,"Kérjük, győződjön meg róla, hogy valóban törölni szeretné az összes tranzakció ennél a vállalatnál. Az Ön törzsadatok marad, ahogy van. Ez a művelet nem vonható vissza."
DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Válaszolt
+DocType: Communication,Replied,Megválaszolt
DocType: Payment Tool,Total Payment Amount,Teljes összeg kiegyenlítéséig
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 lehet nagyobb, mint a tervezett quanitity ({2}) a gyártási utasítás {3}"
-DocType: Shipping Rule,Shipping Rule Label,Szállítási szabály Label
+DocType: Shipping Rule,Shipping Rule Label,Szállítási lehetőség címkéi
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
DocType: Newsletter,Test,Teszt
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
@@ -1927,29 +1927,29 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} nem nyújtják be
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Kérelmek tételek.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Külön termelési érdekében jön létre minden kész a jó elemet.
-DocType: Email Digest,New Communications,Új kommunikációs
-DocType: Purchase Invoice,Terms and Conditions1,Feltételek és Conditions1
+DocType: Email Digest,New Communications,Új kommunikáció
+DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Teljes beállítás
DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt befagyva, hogy ez az időpont, senkinek nincs joga / módosítani bejegyzést kivéve szerepet az alábbiak szerint."
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +124,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, utána karbantartási ütemterv"
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,A projekt állásáról
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt állapota
DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze frakciók. (A számok)"
apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,Hírlevél levelezőlista
-DocType: Delivery Note,Transporter Name,Szállító Név
+DocType: Delivery Note,Transporter Name,Fuvarozó neve
DocType: Contact,Enter department to which this Contact belongs,"Adja egysége, ahova a kapcsolattartónak tartozik"
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Összesen Hiány
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mértékegység
DocType: Fiscal Year,Year End Date,Év végi dátum
-DocType: Task Depends On,Task Depends On,Feladat Attól On
-DocType: Lead,Opportunity,Alkalom
+DocType: Task Depends On,Task Depends On,A feladat tőle függ:
+DocType: Lead,Opportunity,Lehetőség
DocType: Salary Structure Earning,Salary Structure Earning,Bérszerkeztet Earning
,Completed Production Orders,Befejezett gyártási rendelések
DocType: Operation,Default Workstation,Alapértelmezett Workstation
DocType: Email Digest,Inventory & Support,Leltár és támogatás
DocType: Notification Control,Expense Claim Approved Message,Jóváhagyott igény indoklása
DocType: Email Digest,How frequently?,Milyen gyakran?
-DocType: Purchase Receipt,Get Current Stock,Get raktárkészlet
+DocType: Purchase Receipt,Get Current Stock,Aktuális raktárkészlet átmásolása
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,Tedd Telepítési feljegyzés
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi szállítási határidő a Serial No {0}
DocType: Production Order,Actual End Date,Tényleges befejezési dátum
@@ -1960,12 +1960,12 @@
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Jóváhagyó felhasználót nem lehet ugyanaz, mint a felhasználó a szabály alkalmazandó"
DocType: SMS Log,No of Requested SMS,Nem kért SMS
DocType: Campaign,Campaign-.####,Kampány -. ####
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Make Invoice,Tedd Számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Make Invoice,Számla készítése
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Piercing,Piercing
DocType: Customer,Your Customer's TAX registration numbers (if applicable) or any general information,Az ügyfél zárjegyük (ha van ilyen) vagy általános információk
apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint Csatlakozás dátuma"
DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki eladja a vállalatok termékek a jutalék."
-DocType: Customer Group,Has Child Node,Van Child Node
+DocType: Customer Group,Has Child Node,Lesz gyerek bejegyzése?
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Írja be a statikus url paramétereket itt (Pl. A feladó = ERPNext, username = ERPNext, password = 1234 stb)"
apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
@@ -1993,7 +1993,7 @@
9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
10. Add or Deduct: Whether you want to add or deduct the tax.","Normál adó sablont, hogy lehet alkalmazni, hogy minden vásárlási tranzakciókat. Ez a sablon tartalmazhat listáját adó fejek és egyéb ráfordítások fejek, mint a ""Shipping"", ""biztosítás"", ""kezelés"" stb #### Megjegyzés Az adó mértéke határozná meg itt lesz az adó normál kulcsának minden ** elemek * *. Ha vannak ** ** elemek, amelyek különböző mértékben, akkor hozzá kell adni a ** Elem Tax ** asztalra a ** Elem ** mester. #### Leírása oszlopok 1. Számítási típus: - Ez lehet a ** Teljes nettó ** (vagyis az összege alapösszeg). - ** Az előző sor Total / Összeg ** (kumulatív adók vagy díjak). Ha ezt a lehetőséget választja, az adó fogják alkalmazni százalékában az előző sor (az adótábla) mennyisége vagy teljes. - ** A tényleges ** (mint említettük). 2. Account Head: A fiók főkönyvi, amelyek szerint ez az adó könyvelik 3. Cost Center: Ha az adó / díj olyan jövedelem (például a szállítás), vagy költségkímélő kell foglalni ellen Cost Center. 4. Leírás: Leírás az adó (amely lehet nyomtatott számlák / idézetek). 5. Rate: adókulcs. 6. Összeg: Adó összege. 7. Teljes: Összesített összesen ebben a kérdésben. 8. Adja Row: Ha alapuló ""Előző Row Total"" kiválaszthatja a sor számát veszik, mint a bázis ezt a számítást (alapértelmezett az előző sor). 9. fontolják meg az adózási vagy illeték: Ebben a részben megadhatja, ha az adó / díj abban az értékelésben (nem része összesen), vagy kizárólag a teljes (nem hozzáadott értéket az elem), vagy mindkettő. 10. Adjon vagy le lehet vonni: Akár akarjuk adni vagy le lehet vonni az adóból."
DocType: Note,Note,Jegyzet
-DocType: Email Digest,New Material Requests,New Material kérések
+DocType: Email Digest,New Material Requests,Új anyag igénylés
DocType: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
DocType: Email Account,Email Ids,E-mail azonosítók
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
@@ -2001,7 +2001,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ez Leave Application jóváhagyására vár. Csak a Leave Jóváhagyó frissítheti állapotát.
-DocType: Global Defaults,Hide Currency Symbol,Hide Valuta Symbol
+DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
DocType: Journal Entry,Credit Note,Jóváírási értesítő
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +206,Completed Qty cannot be more than {0} for operation {1},"Befejezett Menny nem lehet több, mint {0} művelet {1}"
@@ -2021,12 +2021,12 @@
DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
DocType: Lead,Fax,Fax
DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Benyújtott
+sites/assets/js/list.min.js +26,Submitted,Elküldve
DocType: Salary Structure,Total Earning,Összesen Earning
DocType: Purchase Receipt,Time at which materials were received,Időpontja anyagok érkezett
apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Szervezet ága mester.
DocType: Purchase Invoice,Will be calculated automatically when you enter the details,"Automatikusan kerül kiszámításra, amikor belép a részleteket"
-DocType: Delivery Note,Transporter lorry number,Transporter teherautó száma
+DocType: Delivery Note,Transporter lorry number,Teherautó rendszáma
DocType: Sales Order,Billing Status,Számlázási állapot
DocType: Backup Manager,Backup Right Now,Mentés most
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Közműben
@@ -2036,10 +2036,10 @@
apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a társaság, Valuta, folyó pénzügyi évben, stb"
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +20,Payment Type,Fizetési mód
DocType: Salary Manager,Select Employees,Válassza ki a munkavállalók
-DocType: Bank Reconciliation,To Date,Hogy dátuma
+DocType: Bank Reconciliation,To Date,Dátumig
DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési Deal
sites/assets/js/form.min.js +286,Details,Részletek
-DocType: Purchase Invoice,Total Taxes and Charges,Összesen adók és illetékek
+DocType: Purchase Invoice,Total Taxes and Charges,Összes adók és költségek
DocType: Email Digest,Payments Made,Teljesített kifizetések
DocType: Employee,Emergency Contact,Sürgősségi Kapcsolat
DocType: Item,Quality Parameters,Minőségi paraméterek
@@ -2066,41 +2066,41 @@
DocType: Account,Income Account,Jövedelem számla
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,Öntvény
DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lásd: ""Rate alapuló anyagok"" a költségszámítás §"
-DocType: Appraisal Goal,Key Responsibility Area,Key Felelősség Area
-DocType: Item Reorder,Material Request Type,Anyag kérés típusa
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lásd az 'Anyagköltség számítás módja' a Költség részben
+DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
+DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumentumok
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
DocType: Cost Center,Cost Center,Költségközpont
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Utalvány #
DocType: Notification Control,Purchase Order Message,Megrendelés Message
-DocType: Upload Attendance,Upload HTML,Feltöltés HTML
+DocType: Upload Attendance,Upload HTML,HTML feltöltése
apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Total advance ({0}) against Order {1} cannot be greater \
than the Grand Total ({2})","Előleg teljes ({0}) ellen Order {1} nem lehet nagyobb, \ mint a Grand Total ({2})"
DocType: Employee,Relieving Date,Tehermentesítő dátuma
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.","Árképzési szabály készül felülírni árjegyzéke / határozza kedvezmény százalékos, néhány olyan feltétel alapján."
DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse csak akkor lehet megváltoztatni keresztül Stock Entry / szállítólevél / vásárlási nyugta
DocType: Employee Education,Class / Percentage,Osztály / Százalékos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Head of Marketing and Sales,Head of Marketing és Értékesítési
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Head of Marketing and Sales,Marketing és Értékesítés vezetője
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Jövedelemadó
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laser engineered net shaping,Laser megtervezett net alakítására
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.","Ha a kiválasztott árképzési szabály készül az ""Ár"", az felülírja árlista. Árképzési szabály ár a végleges ár, így további kedvezményt kellene alkalmazni. Ezért a tranzakciók, mint a vevői rendelés, megrendelés, stb, akkor kerül letöltésre a ""Rate"" mezőbe, ahelyett, hogy ""árjegyzéke Rate"" mezőben."
apps/erpnext/erpnext/config/selling.py +158,Track Leads by Industry Type.,A pálya vezet az ipar típusa.
-DocType: Item Supplier,Item Supplier,Elem Szállító
+DocType: Item Supplier,Item Supplier,Anyagbeszállító
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +331,Please enter Item Code to get batch no,"Kérjük, adja tételkód hogy batch nincs"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +679,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} quotation_to {1}"
DocType: Global Defaults,For automatic exchange rates go to jsonrates.com and signup for an API key,Az automatikus árfolyamok megy jsonrates.com és regisztráljon egy API kulcsot
apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Minden címek.
-DocType: Company,Stock Settings,Stock Beállítások
+DocType: Company,Stock Settings,Készlet beállítások
DocType: User,Bio,Életrajz
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","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,A vevői csoport fa.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Új Cost Központ neve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Új költségközpont neve
DocType: Leave Control Panel,Leave Control Panel,Hagyja Vezérlőpult
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.,"Nincs alapértelmezett Címsablon találhatók. Kérjük, hozzon létre egy újat a Setup> Nyomtatás és Branding> Címsablon."
DocType: Appraisal,HR User,HR Felhasználó
-DocType: Purchase Invoice,Taxes and Charges Deducted,Adók és díjak levonásra
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Kérdések
+DocType: Purchase Invoice,Taxes and Charges Deducted,Levont adók és költségek
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Problémák
apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},Állapot közül kell {0}
DocType: Sales Invoice,Debit To,Megterhelése
DocType: Delivery Note,Required only for sample item.,Szükséges csak a minta elemet.
@@ -2112,7 +2112,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Pressing,Nyomás
DocType: Payment Tool Detail,Payment Tool Detail,Fizetési eszköz Detail
,Sales Browser,Értékesítési Browser
-DocType: Journal Entry,Total Credit,Az összes hitel
+DocType: Journal Entry,Total Credit,Követelés összesen
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,Helyi
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
@@ -2128,7 +2128,7 @@
apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bezár Mérleg és a könyv nyereség vagy veszteség.
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Adja árfolyam átalakítani egy pénznem egy másik
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}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {0} is cancelled,Idézet {0} törölték
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {0} is cancelled,{0} ajánlat törölve
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Teljes fennálló összege
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} volt szabadságon lévő {1}. Nem jelölhet részvétel.
DocType: Sales Partner,Targets,Célok
@@ -2159,69 +2159,69 @@
1. Terms of shipping, if applicable.
1. Ways of addressing disputes, indemnity, liability, etc.
1. Address and Contact of your Company.","Általános Szerződési Feltételek felvehető értékesítés és a beszerzés. Példák: 1. érvényessége az ajánlatot. 1. Fizetési feltételek (előre hitelre, része előre stb). 1. Mi az extra (vagy az ügyfél által fizetendő). 1. Biztonsági / használati figyelmeztetést. 1. A garanciális ha van ilyen. 1. garancia Policy. 1. szállítási feltételek, ha van ilyen. 1. hogyan lehetne kezelni viták, kártérítési felelősség stb 1. Cím és kapcsolattartási cége."
-DocType: Attendance,Leave Type,Leave Type
+DocType: Attendance,Leave Type,Szabadság típusa
apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Költség / Difference számla ({0}) kell lennie az ""eredmény"" fiók"
DocType: Account,Accounts User,Fiók-felhasználó
DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Ellenőrizze, hogy az ismétlődő számlát, törölje megállítani visszatérő vagy tegye megfelelő End Date"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,A {0} munkavállaló már megjelölt a jelenlétin
DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomagot azonos típusú (nyomtatási)
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,Maximum {0} sorok megengedett
-DocType: C-Form Invoice Detail,Net Total,Teljes nettó
+DocType: C-Form Invoice Detail,Net Total,Nettó összesen
DocType: Bin,FCFS Rate,FCFS Rate
apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Számlázás (Eladási számla)
DocType: Payment Reconciliation Invoice,Outstanding Amount,Fennálló összeg
-DocType: Project Task,Working,Working
+DocType: Project Task,Working,Folyamatban
DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,"Kérjük, válasszon Time Naplók."
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},{0} nem tartozik Company {1}
,Requested Qty,Kért Mennyiség
-DocType: BOM Item,Scrap %,Fémhulladék%
+DocType: BOM Item,Scrap %,Hulladék %
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","Díjak kerülnek kiosztásra alapján arányosan elem Mennyiség vagy összeget, mint egy a kiválasztás"
-DocType: Maintenance Visit,Purposes,Célokra
+DocType: Maintenance Visit,Purposes,Célok
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","Működés {0} hosszabb, mint bármely rendelkezésre álló munkaidő munkaállomás {1}, lebontják a művelet a több művelet"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electrochemical machining,Elektrokémiai megmunkálás
,Requested,Kért
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +62,No Remarks,Nem Megjegyzés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +62,No Remarks,Nincs megjegyzés
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +11,Overdue,Lejárt
DocType: Account,Stock Received But Not Billed,"Stock érkezett, de nem számlázzák"
DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttó bér + hátralékot összeg + beváltása Összeg - Total levonása
DocType: Monthly Distribution,Distribution Name,Nagykereskedelem neve
-DocType: Features Setup,Sales and Purchase,Értékesítési és beszerzési
-DocType: Pricing Rule,Price / Discount,Ár / kedvezmény
-DocType: Purchase Order Item,Material Request No,Anyag kérése Semmi
+DocType: Features Setup,Sales and Purchase,Értékesítés és beszerzés
+DocType: Pricing Rule,Price / Discount,Árazás / Engedmény
+DocType: Purchase Order Item,Material Request No,Anyagigénylés száma
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amely ügyfél deviza átalakul cég bázisvalutaként"
DocType: Purchase Invoice,Discount Amount (Company Currency),Kedvezmény összege (Társaság Currency)
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} óta sikeresen megszüntette a listából.
DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Társaság Currency)
apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Kezelése Terület fa.
-DocType: Payment Reconciliation Payment,Sales Invoice,Értékesítési számlák
+DocType: Payment Reconciliation Payment,Sales Invoice,Eladási számla
DocType: Journal Entry Account,Party Balance,Párt Balance
-DocType: Sales Invoice Item,Time Log Batch,Idő Bejelentkezés Batch
+DocType: Sales Invoice Item,Time Log Batch,Időnapló gyűjtő
apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,"Kérjük, válassza az Apply kedvezmény"
DocType: Company,Default Receivable Account,Alapértelmezett Receivable Account
DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,Készítse Bank Belépő a teljes bért fizet a fent kiválasztott kritériumoknak
DocType: Item,Item will be saved by this name in the data base.,Elem mentésre kerül ezen a néven az adatbázisban.
-DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer gyártásához
+DocType: Stock Entry,Material Transfer for Manufacture,Anyag átrakása gyártásához
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.,Kedvezmény százalékos lehet alkalmazni vagy ellen árlistában vagy az összes árlistában.
-DocType: Purchase Invoice,Half-yearly,Félévenként
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiscal Year {0} nem található.
+DocType: Purchase Invoice,Half-yearly,Félévente
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,A {0} pénzügyi év nem található.
DocType: Bank Reconciliation,Get Relevant Entries,Get vonatkozó bejegyzései
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,Számviteli könyvelése Stock
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,Coining
-DocType: Sales Invoice,Sales Team1,Értékesítési team1
+DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,Elem {0} nem létezik
DocType: Item,"Selecting ""Yes"" will allow you to make a Production Order for this item.","""Igen"" kiválasztása lehetővé teszi, hogy a gyártási megrendelést ez a tétel."
DocType: Sales Invoice,Customer Address,Vevő címe
-DocType: Purchase Invoice,Total,Teljes
+DocType: Purchase Invoice,Total,Összesen
DocType: Backup Manager,System for managing Backups,Kezelő rendszer mentések
DocType: Account,Root Type,Root Type
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Telek
DocType: Item Group,Show this slideshow at the top of the page,Mutasd ezt slideshow a lap tetején
-DocType: BOM,Item UOM,Elem UOM
+DocType: BOM,Item UOM,Az anyag mennyiségi egysége
DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege után kedvezmény összege (Társaság Currency)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +165,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
-DocType: Quality Inspection,Quality Inspection,Minőség-ellenőrzési
+DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Extra Small,Extra Small
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,Spray képező
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
@@ -2232,11 +2232,11 @@
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vagy BS
apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum készletszint
-DocType: Stock Entry,Subcontract,Az alvállalkozói
+DocType: Stock Entry,Subcontract,Alvállalkozói
DocType: Production Planning Tool,Get Items From Sales Orders,Hogy elemeket Vevőmegrendelés
DocType: Production Order Operation,Actual End Time,Tényleges befejezési időpont
DocType: Production Planning Tool,Download Materials Required,Anyagszükséglet letöltése
-DocType: Item,Manufacturer Part Number,Gyári szám
+DocType: Item,Manufacturer Part Number,Gyártó cikkszáma
DocType: Production Order Operation,Estimated Time and Cost,Becsült idő és költség
DocType: Bin,Bin,Láda
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Nosing,Ütköző
@@ -2247,18 +2247,18 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +146,Colour,Szín
DocType: Maintenance Visit,Scheduled,Ütemezett
DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki havi megoszlása egyenlőtlen osztja célok hónapok között.
-DocType: Purchase Invoice Item,Valuation Rate,Értékelési Rate
+DocType: Purchase Invoice Item,Valuation Rate,Becsült érték
DocType: Address,Check to make Shipping Address,"Ellenőrizze, hogy a szállítási cím"
apps/erpnext/erpnext/stock/get_item_details.py +253,Price List Currency not selected,Árlista Ki nem választott
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,"Elem Row {0}: vásárlási nyugta {1} nem létezik a fent 'Vásárlás bevételek ""tábla"
DocType: Pricing Rule,Applicability,Alkalmazhatóság
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,A projekt indulásának időpontja
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt kezdési dátuma
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Míg
-DocType: Rename Tool,Rename Log,Átnevezése Bejelentkezés
+DocType: Rename Tool,Rename Log,Átnevezési napló
DocType: Installation Note Item,Against Document No,Ellen Document No
apps/erpnext/erpnext/config/selling.py +93,Manage Sales Partners.,Kezelje a forgalmazókkal.
-DocType: Quality Inspection,Inspection Type,Ellenőrzés típusa
+DocType: Quality Inspection,Inspection Type,Vizsgálat típusa
apps/erpnext/erpnext/controllers/recurring_document.py +160,Please select {0},"Kérjük, válassza ki a {0}"
DocType: C-Form,C-Form No,C-Form No
DocType: BOM,Exploded_items,Exploded_items
@@ -2269,7 +2269,7 @@
apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Bejövő minőségi ellenőrzés.
DocType: Employee,Exit,Kilépés
apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Root Type is mandatory,Root Type kötelező
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Serial No {0} created,Serial No {0} létre
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Serial No {0} created,{0} sorozatszám létrehozva
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Vibratory finishing,Vibrációs befejező
DocType: Item,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A könnyebb ügyfelek, ezek a kódok használhatók a nyomtatási formátumok, mint számlákon és a szállítóleveleken"
DocType: Journal Entry Account,Against Purchase Order,Ellen Megrendelés
@@ -2281,47 +2281,47 @@
DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Vásárlási nyugta mellékelt tételek
sites/assets/js/erpnext.min.js +43,Pay,Fizet
apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Hogy Datetime
-DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
+DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Grinding,Őrlés
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink wrapping,Zsugorfóliázó
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Szállító> Szállító Type
apps/erpnext/erpnext/hr/doctype/employee/employee.py +123,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
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,"Serial No {0} állapotát kell lennie ""elérhető"" cselekedni!"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +237,Serial No {0} status must be 'Available' to Deliver,"A(z) {0} sorozatszám állapota 'Elérhető' kell, hogy legyen a szállításhoz"
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Address Cím kötelező.
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg nevét kampányt, ha a forrása a vizsgálódás kampány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,Lapkiadók
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,Hírlevél publikálók
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Válassza ki Fiscal Year
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Smelting,Smelting
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,"Te vagy a Leave Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
DocType: Attendance,Attendance Date,Jelenléti dátuma
DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés szakítás alapján a kereseti és levonás.
apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Account with child nodes cannot be converted to ledger,Számlát a gyermek csomópontok nem lehet átalakítani főkönyvi
-DocType: Address,Preferred Shipping Address,Előnyben Szállítási cím
+DocType: Address,Preferred Shipping Address,Ez legyen a szállítási cím is
DocType: Purchase Receipt Item,Accepted Warehouse,Elfogadott raktár
-DocType: Bank Reconciliation Detail,Posting Date,Könyvelési dátum
-DocType: Item,Valuation Method,Értékelési módszer
-DocType: Sales Invoice,Sales Team,Értékesítési csapat
+DocType: Bank Reconciliation Detail,Posting Date,Rögzítés dátuma
+DocType: Item,Valuation Method,Készletérték számítása
+DocType: Sales Invoice,Sales Team,Értékesítő csapat
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Duplicate entry,Ismétlődő bejegyzés
-DocType: Serial No,Under Warranty,Garanciális
+DocType: Serial No,Under Warranty,Garanciaidőn belül
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +425,[Error],[Hiba]
DocType: Sales Order,In Words will be visible once you save the Sales Order.,"A szavak lesz látható, ha menteni a Vevői rendelés."
,Employee Birthday,Munkavállaló születésnapja
DocType: GL Entry,Debit Amt,Tartozás összege
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Venture Capital,Venture Capital
-DocType: UOM,Must be Whole Number,Teljesnek kell lennie száma
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Új levelek Lekötött (napokban)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} nem létezik
+DocType: UOM,Must be Whole Number,Egész számnak kell lennie
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Új szabadság lefoglalása (napokban)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,A {0} sorozatszám nem létezik
DocType: Pricing Rule,Discount Percentage,Kedvezmény százaléka
DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,Rendelés
DocType: Leave Control Panel,Employee Type,Munkaviszony típusa
-DocType: Employee Leave Approver,Leave Approver,Hagyja Jóváhagyó
+DocType: Employee Leave Approver,Leave Approver,Szabadság jóváhagyó
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,Swaging
DocType: Expense Claim,"A user with ""Expense Approver"" role","A felhasználó ""Költség Jóváhagyó"" szerepét"
-,Issued Items Against Production Order,Kiadott tételek ellenében rendelés
+,Issued Items Against Production Order,Gyártás rendelést akadályozó problémák
DocType: Pricing Rule,Purchase Manager,Beszerzési menedzser
DocType: Payment Tool,Payment Tool,Fizetési eszköz
DocType: Target Detail,Target Detail,Cél részlete
@@ -2334,21 +2334,21 @@
DocType: Customer,Credit Limit,Credit Limit
DocType: Features Setup,To enable <b>Point of Sale</b> features,"Annak érdekében, hogy <b> Point of Sale </ b> jellemzői"
DocType: Purchase Receipt,LR Date,LR dátuma
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Válassza ki a tranzakció típusa
-DocType: GL Entry,Voucher No,Betétlapjának
-DocType: Leave Allocation,Leave Allocation,Hagyja Kiosztási
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Tranzakció kiválasztása
+DocType: GL Entry,Voucher No,Bizonylatszám
+DocType: Leave Allocation,Leave Allocation,Szabadság lefoglalása
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,'Update Stock' for Értékesítési számlák {0} kell állítani
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,Anyag kérelmeket {0} létre
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,{0} anyagigénylés létrejött
apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,Sablon kifejezések vagy szerződés.
-DocType: Employee,Feedback,Visszacsatolás
+DocType: Employee,Feedback,Visszajelzés
apps/erpnext/erpnext/accounts/party.py +192,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Mivel / Referencia dátum meghaladja a megengedett ügyfél hitel nap {0} nap (ok)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Abrasive jet machining,Abrazív vízsugaras megmunkálás
-DocType: Stock Settings,Freeze Stock Entries,Freeze Stock bejegyzések
+DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
DocType: Website Settings,Website Settings,Weboldal beállítások
DocType: Activity Cost,Billing Rate,Díjszabás
,Qty to Deliver,Mennyiség cselekedni!
DocType: Monthly Distribution Percentage,Month,Hónap
-,Stock Analytics,Stock Analytics
+,Stock Analytics,Készlet analítika
DocType: Installation Note Item,Against Document Detail No,Ellen Document Részlet No
DocType: Quality Inspection,Outgoing,Kimenő
DocType: Material Request,Requested For,Igényelt
@@ -2363,10 +2363,10 @@
DocType: Supplier,Material Manager,Anyag menedzser
DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
DocType: Time Log,Costing Rate (per hour),Költségszámítás Rate (óránként)
-DocType: Serial No,Warranty / AMC Details,Garancia / AMC Részletek
-DocType: Journal Entry,User Remark,Felhasználó Megjegyzés
-apps/erpnext/erpnext/config/accounts.py +117,Point-of-Sale Setting,Point-of-Sale Setting
-DocType: Lead,Market Segment,Piaci szegmens
+DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
+DocType: Journal Entry,User Remark,Felhasználói megjegyzés
+apps/erpnext/erpnext/config/accounts.py +117,Point-of-Sale Setting,Értékesítési hely (POS) beállítása
+DocType: Lead,Market Segment,Piaci rész
DocType: Communication,Phone,Telefon
DocType: Purchase Invoice,Supplier (Payable) Account,Szállító (fizetendő) Account
DocType: Employee Internal Work History,Employee Internal Work History,A munkavállaló cégen belüli mozgása
@@ -2377,7 +2377,7 @@
DocType: Sales Invoice,Write Off Outstanding Amount,Írja Off fennálló összeg
DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Ellenőrizze, hogy szükség van az automatikus visszatérő számlákat. Benyújtása után minden értékesítési számlát, ismétlődő szakasz lesz látható."
DocType: Account,Accounts Manager,Fiókkezelõ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',"Idő Bejelentkezés {0} kell ""Beküldte"""
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',"A(z) {0} időnaplót be kell ""Küldeni"""
DocType: Stock Settings,Default Stock UOM,Alapértelmezett mértékegység
DocType: Production Planning Tool,Create Material Requests,Anyagigénylés létrehozása
DocType: Employee Education,School/University,Iskola / Egyetem
@@ -2385,14 +2385,14 @@
,Billed Amount,Számlázott összeg
DocType: Bank Reconciliation,Bank Reconciliation,Bank Megbékélés
DocType: Purchase Invoice,Total Amount To Pay,Összesen fizetendő összeg
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,"Anyag Igény {0} törölték, vagy leáll"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
DocType: Event,Groups,Csoportok
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,Csoport által Account
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,Számla által csoportosítva
DocType: Sales Order,Fully Delivered,Teljesen szállítva
DocType: Lead,Lower Income,Alacsonyabb jövedelmű
DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","A számla fej mellett felelősség, amelyben Profit / Loss könyvelik"
DocType: Payment Tool,Against Vouchers,Ellen utalványok
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Gyors segítség
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Gyors súgó
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},Forrás és cél raktárban nem lehet azonos sorban {0}
DocType: Features Setup,Sales Extras,Értékesítési Extrák
apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} költségvetés Account {1} ellen Cost Center {2} meg fogja haladni a {3}
@@ -2401,11 +2401,11 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátumtól"" későbbinek kell lennie mint a ""Dátumig"""
,Stock Projected Qty,Stock kivetített Mennyiség
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
-DocType: Warranty Claim,From Company,A cégtől
+DocType: Warranty Claim,From Company,Cégtől
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Érték vagy menny
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Minute,Perc
DocType: Purchase Invoice,Purchase Taxes and Charges,Adókat és díjakat
-DocType: Backup Manager,Upload Backups to Dropbox,Töltsd fel mentések a Dropbox
+DocType: Backup Manager,Upload Backups to Dropbox,Mentés feltöltése a Dropboxba
,Qty to Receive,Mennyiség fogadáshoz
DocType: Leave Block List,Leave Block List Allowed,Hagyja Block List hozhatja
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,Konverziós faktor nem lehet a frakciók
@@ -2414,10 +2414,10 @@
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Minden beszállító típusok
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Idézet {0} nem type {1}
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartási ütemterv Elem
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó eszköz
DocType: Sales Order,% Delivered,% kiszállítva
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Folyószámlahitel Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Tedd Fizetés Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bérlap készítése
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Kidugaszol
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zálogkölcsön
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Figyelmen kívül hagyva:
@@ -2441,25 +2441,25 @@
DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Arány, amely Árlista pénznemben átalakul ügyfél alap deviza"
DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság Currency)
DocType: BOM Operation,Hour Rate,Órás sebesség
-DocType: Stock Settings,Item Naming By,Elem Elnevezése a
+DocType: Stock Settings,Item Naming By,Elem elnevezés típusa
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,Árajánlat
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Egy újabb pont a nevezési határidő {0} azután tette {1}
-DocType: Production Order,Material Transferred for Manufacturing,Anyag átadott Manufacturing
+DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Account {0} nem létezik
DocType: Purchase Receipt Item,Purchase Order Item No,Megrendelés tétel
-DocType: System Settings,System Settings,System Settings
+DocType: System Settings,System Settings,Rendszer beállításai
DocType: Project,Project Type,Projekt típusa
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vagy target Menny vagy előirányzott összeg kötelező.
apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Költségek különböző tevékenységek
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +93,Not allowed to update stock transactions older than {0},"Nem engedélyezett frissíteni részvény tranzakciók idősebb, mint {0}"
-DocType: Item,Inspection Required,Ellenőrzés szükséges
+DocType: Item,Inspection Required,Minőség-ellenőrzés szükséges
DocType: Purchase Invoice Item,PR Detail,PR részlete
DocType: Sales Order,Fully Billed,Teljesen számlázott
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,A készpénz
DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A bruttó tömeg a csomag. Általában a nettó tömeg + csomagolóanyag súlyát. (Nyomtatási)
DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a szereppel megengedett, hogy a befagyasztott számlák és létrehozza / módosítja könyvelési tételek ellen befagyasztott számlák"
-DocType: Serial No,Is Cancelled,Van Törölt
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,Saját FedEx
+DocType: Serial No,Is Cancelled,ez törölve
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,Saját szállítások
DocType: Journal Entry,Bill Date,Bill dátuma
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:","Még ha több árképzési szabályok kiemelten, akkor a következő belső prioritások kerülnek alkalmazásra:"
DocType: Supplier,Supplier Details,Beszállító részletei
@@ -2477,27 +2477,27 @@
DocType: Company,Default Income Account,Alapértelmezett bejövő számla
apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vásárlói csoport / Ügyfélszolgálat
DocType: Item Group,Check this if you want to show in website,"Jelölje be, ha azt szeretné, hogy megmutassa a honlapon"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +189,Welcome to ERPNext,Üdvözöljük a ERPNext
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +189,Welcome to ERPNext,Üdvözöl az ERPNext
DocType: Payment Reconciliation Payment,Voucher Detail Number,Utalvány Részlet száma
DocType: Lead,From Customer,Az Ügyfél
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Hívások
DocType: Project,Total Costing Amount (via Time Logs),Összesen Költség Összeg (via Idő Napló)
-DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
+DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} megadása többször Termék változatok táblázat
-,Projected,Vetített
+,Projected,Tervezett
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Serial No {0} nem tartozik Warehouse {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},Megjegyzés: Referencia dátum meghaladja a megengedett hitel napon {0} nap {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,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
DocType: Notification Control,Quotation Message,Idézet Message
-DocType: Issue,Opening Date,Megnyitásának időpontja
+DocType: Issue,Opening Date,Kezdési dátum
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +23,POS Setting {0} already created for user: {1} and company {2},POS Setting {0} már létrehozott felhasználói: {1} és vállalati {2}
DocType: Journal Entry,Remark,Megjegyzés
-DocType: Purchase Receipt Item,Rate and Amount,Mértéke és összege
+DocType: Purchase Receipt Item,Rate and Amount,Érték és mennyiség
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Boring,Unalmas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +680,From Sales Order,Re Vevői
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +680,From Sales Order,Áthozás értékesítési megrendelésből
DocType: Blog Category,Parent Website Route,Szülő Weboldal Route
-DocType: Sales Order,Not Billed,Nem számlázzák
+DocType: Sales Order,Not Billed,Nem számlázott
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
sites/assets/js/erpnext.min.js +20,No contacts added yet.,Nem szerepel partner még.
apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nem aktív
@@ -2505,12 +2505,12 @@
DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Beszerzési költség utalvány összege
DocType: Time Log,Batched for Billing,Kötegelt a számlázással
apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills által felvetett Szállítók.
-DocType: POS Setting,Write Off Account,Írja Off Account
+DocType: POS Setting,Write Off Account,Leíró számla
DocType: Purchase Invoice,Discount Amount,Kedvezmény összege
-DocType: Item,Warranty Period (in days),Garanciális időszak (napban)
+DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
DocType: Email Digest,Expenses booked for the digest period,Költségek sárga a roncsolt időszakban
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,pl. ÁFA
-DocType: Journal Entry Account,Journal Entry Account,Naplókönyvelés Account
+DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
DocType: Shopping Cart Settings,Quotation Series,Idézet Series
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","Egy elem létezik azonos nevű ({0}), kérjük, változtassa meg a tételt csoport nevét, vagy nevezze át a tételt"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,Forró fém gázt előállító
@@ -2524,12 +2524,12 @@
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +113,Missing Currency Exchange Rates for {0},Hiányzó valutaárfolyamok: {0}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Laser cutting,Lézeres vágás
DocType: Event,Monday,Hétfő
-DocType: Journal Entry,Stock Entry,Stock Entry
+DocType: Journal Entry,Stock Entry,Készlet mozgás
DocType: Account,Payable,Kifizetendő
DocType: Salary Slip,Arrear Amount,Hátralék összege
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új vásárlóknak
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Bruttó Profit%
-DocType: Appraisal Goal,Weightage (%),Weightage (%)
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új vásárló
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Bruttó nyereség %
+DocType: Appraisal Goal,Weightage (%),Súlyozás (%)
DocType: Bank Reconciliation Detail,Clearance Date,Távolság dátuma
DocType: Newsletter,Newsletter List,Hírlevél listája
DocType: Salary Manager,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Ellenőrizze, hogy a küldeni kívánt fizetése csúszik mail fel az alkalmazottaknak, míg benyújtásával fizetés slip"
@@ -2537,17 +2537,17 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast egyik elad vagy vesz ki kell választani
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","Különbség figyelembe kell egy ""Felelősség"" típusú számla, hiszen ez a Stock Megbékélés egy nyílás Entry"
apps/erpnext/erpnext/stock/doctype/item/item.js +215,"Variants can not be created manually, add item attributes in the template item","Változatok nem lehet létrehozni manuálisan, hozzáad attribútumokat a sablon elem"
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ahol a gyártási műveleteket végezni.
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ahol a gyártási műveleteket végzik.
DocType: Page,All,Minden
-DocType: Stock Entry Detail,Source Warehouse,Forrás Warehouse
+DocType: Stock Entry Detail,Source Warehouse,Forrás raktár
DocType: Installation Note,Installation Date,Telepítés dátuma
DocType: Employee,Confirmation Date,Visszaigazolás
DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
DocType: Communication,Sales User,Értékesítési Felhasználó
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Min Menny nem lehet nagyobb, mint Max Mennyiség"
apps/frappe/frappe/core/page/permission_manager/permission_manager.js +421,Set,Set
-DocType: Item,Warehouse-wise Reorder Levels,Warehouse-bölcs Reorder Levels
-DocType: Lead,Lead Owner,Lead Tulajdonos
+DocType: Item,Warehouse-wise Reorder Levels,Raktárankénti újrarendelési szint
+DocType: Lead,Lead Owner,Célpont tulajdonosa
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +241,Warehouse is required,Warehouse van szükség
DocType: Employee,Marital Status,Családi állapot
DocType: Stock Settings,Auto Material Request,Automata anyagrendelés
@@ -2558,13 +2558,13 @@
apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% szállítva
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).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi elosztási százalék
-DocType: Territory,Territory Targets,Terület célok
-DocType: Delivery Note,Transporter Info,Transporter Info
+DocType: Territory,Territory Targets,Területi célpontok
+DocType: Delivery Note,Transporter Info,Fuvarozó adatai
DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Megrendelés mellékelt tételek
apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Levél fejek a nyomtatási sablonok.
apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Címeket nyomtatási sablonok pl Pro forma számla.
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Értékelés típusú költségeket nem lehet megjelölni Inclusive
-DocType: POS Setting,Update Stock,Frissítés Stock
+DocType: POS Setting,Update Stock,Készlet frissítése
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Superfinishing,Szuperfiniselési
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.,"Különböző mértékegysége elemek, az helytelen (Total) Nettó súly értéket. Győződjön meg arról, hogy a nettó tömege egyes tételek ugyanabban UOM."
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -2583,13 +2583,13 @@
DocType: Purchase Taxes and Charges,Reference Row #,Referencia Row #
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},Batch szám kötelező tétel {0}
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Ez egy gyökér értékesítő személyt, és nem lehet szerkeszteni."
-,Stock Ledger,Stock Ledger
+,Stock Ledger,Készlet könyvelés
DocType: Salary Slip Deduction,Salary Slip Deduction,Fizetés Slip levonása
apps/erpnext/erpnext/stock/doctype/item/item.py +368,"To set reorder level, item must be a Purchase Item","Beállítani újrarendezésből szinten, elemet kell a vásárlást tétel"
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Megjegyzések
+apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Jegyzetek
DocType: Opportunity,From,-tól
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +192,Select a group node first.,Válasszon egy csoportot csomópont először.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Purpose must be one of {0},Cél közül kell {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Purpose must be one of {0},Ezen célok közül kell választani: {0}
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Töltse le a jelentést, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapot"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Facing,Szembenézni
@@ -2599,9 +2599,9 @@
DocType: Time Log,Billable,Számlázható
DocType: Authorization Rule,This will be used for setting rule in HR module,Ez lesz használva beállítására szabály HR modulban
DocType: Account,Rate at which this tax is applied,"Arány, amely ezt az adót alkalmaznak"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,Reorder Mennyiség
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,Újra rendelendő mennyiség
DocType: Company,Stock Adjustment Account,Stock korrekció számla
-DocType: Sales Invoice,Write Off,Írd Le
+DocType: Sales Invoice,Write Off,Leíró
DocType: Time Log,Operation ID,Operation ID
DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Rendszer felhasználói (login) ID. Ha be van állítva, ez lesz az alapértelmezés minden HR formák."
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}
@@ -2609,18 +2609,18 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +81,Opportunity Lost,Elveszített lehetőség
DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Kedvezmény Fields lesz kapható Megrendelés, vásárlási nyugta, vásárlási számla"
DocType: Report,Report Type,Report Type
-apps/frappe/frappe/core/doctype/user/user.js +136,Loading,Terhelés
+apps/frappe/frappe/core/doctype/user/user.js +136,Loading,Betöltés
DocType: BOM Replace Tool,BOM Replace Tool,Anyagjegyzék cserélő eszköz
apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Országonként eltérő címlista sablonok
apps/erpnext/erpnext/accounts/party.py +196,Due / Reference Date cannot be after {0},A határidő / referencia dátum nem lehet {0} utáni
DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Ha bevonják a gyártási tevékenység. Engedélyezi tétel ""gyártják"""
-DocType: Sales Invoice,Rounded Total,Lekerekített Total
+DocType: Sales Invoice,Rounded Total,Kerekített összeg
DocType: Sales BOM,List items that form the package.,A lista elemei alkotják a csomagot.
apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%
-DocType: Serial No,Out of AMC,Out of AMC
+DocType: Serial No,Out of AMC,ÉKSz időn túl
DocType: Purchase Order Item,Material Request Detail No,Anyag kérése Részlet No
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Hard turning,Keményesztergálást
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Hogy a karbantartás látogatás
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Karbantartási látogatás készítése
apps/erpnext/erpnext/selling/doctype/customer/customer.py +165,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználónak, akik Sales mester menedzser {0} szerepe"
DocType: Company,Default Cash Account,Alapértelmezett pénzforgalmi számlát
apps/erpnext/erpnext/config/setup.py +91,Company (not Customer or Supplier) master.,Cég (nem ügyfél vagy szállító) mestere.
@@ -2641,7 +2641,7 @@
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Hogy hozzon létre egy Bankszámla
DocType: Hub Settings,Publish Availability,Közzé Elérhetőség
apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,"Születési idő nem lehet nagyobb, mint ma."
-,Stock Ageing,Stock Ageing
+,Stock Ageing,Készlet öregedés
DocType: Purchase Receipt,Automatically updated from BOM table,Automatikusan frissíteni a BOM táblázatban
apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Beállítás Nyílt
@@ -2654,27 +2654,27 @@
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,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Responsibilities,Felelősségek
apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Sablon
-DocType: Sales Person,Sales Person Name,Sales személy Név
+DocType: Sales Person,Sales Person Name,Értékesítő neve
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Kérjük, adja atleast 1 számlát a táblázatban"
-DocType: Pricing Rule,Item Group,Elem Group
+DocType: Pricing Rule,Item Group,Anyagcsoport
DocType: Task,Actual Start Date (via Time Logs),Tényleges kezdési dátum (via Idő Napló)
DocType: Stock Reconciliation Item,Before reconciliation,Mielőtt megbékélés
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és Illetékek hozzá (Társaság Currency)
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadása (a cég pénznemében)
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,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
DocType: Sales Order,Partly Billed,Részben számlázott
DocType: Item,Default BOM,Alapértelmezett 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,"Kérjük ismíteld cég nevét, hogy erősítse"
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló Amt
-DocType: Time Log Batch,Total Hours,Összes óra
+DocType: Time Log Batch,Total Hours,Össz óraszám
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Automotive
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Elhagyja a {0} típusú már elkülönített Employee {1} for Fiscal Year {0}
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Elem szükséges
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,Fém fröccsöntés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,A szállítástól Note
-DocType: Time Log,From Time,From Time
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,Áthozás fuvarlevélből
+DocType: Time Log,From Time,Időtől
DocType: Notification Control,Custom Message,Egyedi üzenet
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,Investment Banking
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Válassza ki az országot, időzóna és a pénznem"
@@ -2687,7 +2687,7 @@
DocType: Purchase Invoice Item,Rate,Arány
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Intern,Intern
DocType: Newsletter,A Lead with this email id should exist,Egy célpont ezzel az email címmel már létezik
-DocType: Stock Entry,From BOM,Honnan BOM
+DocType: Stock Entry,From BOM,Anyagjegyzékből
DocType: Time Log,Billing Rate (per hour),Számlázási Rate (óránként)
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Alapvető
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,Részvény tranzakciók előtt {0} befagyasztották
@@ -2696,16 +2696,16 @@
apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","pl. kg, egység, sz., m"
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Joining must be greater than Date of Birth,A belépés dátumának nagyobbnak kell lennie a születési dátumnál
-DocType: Salary Structure,Salary Structure,Bérszerkeztet
+DocType: Salary Structure,Salary Structure,Bérrendszer
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +237,"Multiple Price Rule exists with same criteria, please resolve \
conflict by assigning priority. Price Rules: {0}","Többszörös Ár szabály létezik azonos kritériumok, kérjük, oldja \ konfliktus elsőbbséget. Ár Szabályok: {0}"
DocType: Account,Bank,Bank
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Airline,Légitársaság
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +511,Issue Material,Kérdés Anyag
-DocType: Material Request Item,For Warehouse,Warehouse
+DocType: Material Request Item,For Warehouse,Ebbe a raktárba
DocType: Employee,Offer Date,Ajánlat dátum
DocType: Hub Settings,Access Token,Access Token
-DocType: Sales Invoice Item,Serial No,Serial No
+DocType: Sales Invoice Item,Serial No,Sorozatszám
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please enter Maintaince Details first,"Kérjük, adja fenntartás Részletek először"
DocType: Item,Is Fixed Asset Item,A befektetett eszközök tételeire
DocType: Stock Entry,Including items for sub assemblies,Beleértve elemek részegységek
@@ -2717,10 +2717,10 @@
DocType: Fiscal Year,Year Name,Év Név
DocType: Salary Manager,Process Payroll,Bérszámfejtéséhez
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
-DocType: Sales Partner,Sales Partner Name,Értékesítési partner neve
+DocType: Sales Partner,Sales Partner Name,Értékesítő partner neve
DocType: Purchase Order Item,Image View,Kép megtekintése
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Finishing & industrial finishing,Befejező & ipari feldolgozása
-DocType: Issue,Opening Time,Nyitási idő
+DocType: Issue,Opening Time,Kezdési idő
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és időpontok megadása
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Securities & Commodity Exchanges,Securities & árutőzsdén
DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
@@ -2732,9 +2732,9 @@
DocType: Sales Order,Customer's Purchase Order Number,Ügyfél megrendelés számát
DocType: Notification Control,Customize the Notification,Értesítés testreszabása
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Hammering,Kalapálás
-DocType: Web Page,Slideshow,Diavetítés
+DocType: Web Page,Slideshow,Diabemutató
apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
-DocType: Sales Invoice,Shipping Rule,Szállítási szabály
+DocType: Sales Invoice,Shipping Rule,Szállítási lehetőség
DocType: Journal Entry,Print Heading,Nyomtatás címsor
DocType: Quotation,Maintenance Manager,Karbantartási vezető
DocType: Workflow State,Search,Keresés
@@ -2752,7 +2752,7 @@
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cost Center with existing transactions can not be converted to ledger,Költség Center meglévő tranzakciók nem lehet átalakítani főkönyvi
DocType: Department,Days for which Holidays are blocked for this department.,Napok után Holidays blokkolja ez az osztály.
,Produced,Készült
-DocType: Issue,Raised By (Email),Által felvetett (e-mail)
+DocType: Issue,Raised By (Email),Felvetette (e-mail)
DocType: Email Digest,General,Általános
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,Levélfejléc csatolása
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a ""Értékelési"" vagy ""Értékelési és Total"""
@@ -2761,13 +2761,13 @@
DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (elnevezését)
DocType: Blog Post,Blog Post,Blog bejegyzés
apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,A kosárban
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,GROUP BY
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Csoportosítva
apps/erpnext/erpnext/config/accounts.py +133,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postai költségek
apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (AMT)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,Szórakozás és szabadidő
DocType: Purchase Order,The date on which recurring order will be stop,"Az időpont, amikor az ismétlődő rend lesz megállítani"
-DocType: Quality Inspection,Item Serial No,Elem Serial No
+DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} vagy növelnie kell overflow tolerancia
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Összesen Present
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,Óra
@@ -2775,24 +2775,24 @@
using Stock Reconciliation",Serialized Elem {0} nem lehet frissíteni \ felhasználásával Stock Megbékélés
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,Át az anyagot szállító
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,Új Serial No nem lehet Warehouse. Warehouse kell beállítani Stock Entry vagy vásárlási nyugta
-DocType: Lead,Lead Type,Lead típus
+DocType: Lead,Lead Type,Célpont típusa
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,Hozzon létre Idézet
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,Mindezen tételek már kiszámlázott
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Lehet jóvá {0}
-DocType: Shipping Rule,Shipping Rule Conditions,Szállítási szabály feltételei
-DocType: BOM Replace Tool,The new BOM after replacement,Az új BOM csere után
-DocType: Features Setup,Point of Sale,Point of Sale
+DocType: Shipping Rule,Shipping Rule Conditions,Szállítás feltételei
+DocType: BOM Replace Tool,The new BOM after replacement,"Az anyagjegyzék, amire le lesz cserélve mindenhol"
+DocType: Features Setup,Point of Sale,Értékesítési hely
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Curling,Bodorítás
DocType: Account,Tax,Adó
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +34,Row {0}: {1} is not a valid {2},Row {0}: {1} nem érvényes {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Refining,Finomítás
-DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
+DocType: Production Planning Tool,Production Planning Tool,Gyártástervező eszköz
DocType: Quality Inspection,Report Date,Jelentés dátuma
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Routing,Routing
DocType: C-Form,Invoices,Számlák
DocType: Job Opening,Job Title,Állás megnevezése
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} címzettek
-DocType: Features Setup,Item Groups in Details,Elem Csoportok Részletek
+DocType: Features Setup,Item Groups in Details,Az anyagcsoport részletei
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,Áfás számlát kötelező
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,Egy új változata (tétel) jön létre az egyes tulajdonságokra érték kombinációja
@@ -2804,7 +2804,7 @@
DocType: Serial No,AMC Expiry Date,"Éves karbantartási szerződés lejárati dátuma
"
,Sales Register,Értékesítési Regisztráció
-DocType: Quotation,Quotation Lost Reason,Idézet Elveszett Reason
+DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
DocType: Address,Plant,Növény
apps/frappe/frappe/desk/moduleview.py +64,Setup,Beállítás
apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkeszteni.
@@ -2814,20 +2814,20 @@
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válasszon átviszi, ha Ön is szeretné közé előző pénzügyi év mérlege hagyja a költségvetési évben"
DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
DocType: POS Setting,POS Setting,POS beállítása
-DocType: Packing Slip,Get Items,Hogy elemeket
+DocType: Packing Slip,Get Items,Tételek áthozása
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Please enter Write Off Account,"Kérjük, adja leírni Account"
DocType: DocField,Image,Kép
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +220,Make Excise Invoice,Tedd Jövedéki számla
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Tedd csomagolás szelvényen
-DocType: Communication,Other,Más
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Csomagjegy készítése
+DocType: Communication,Other,Egyéb
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,Operation ID nincs beállítva
DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
DocType: Serial No,Creation Document Type,Creation Document Type
DocType: Leave Type,Is Encash,A behajt
-DocType: Purchase Invoice,Mobile No,Mobile No
+DocType: Purchase Invoice,Mobile No,Mobiltelefon
DocType: Payment Tool,Make Journal Entry,Tedd Naplókönyvelés
-DocType: Leave Allocation,New Leaves Allocated,Új levelek Lekötött
+DocType: Leave Allocation,New Leaves Allocated,Új szabadság lefoglalás
apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
DocType: Project,Expected End Date,Várható befejezés dátuma
DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
@@ -2835,15 +2835,15 @@
DocType: Cost Center,Distribution Id,Nagykereskedelem azonosító
apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Minden termék és szolgáltatás.
-DocType: Purchase Invoice,Supplier Address,Szállító címe
+DocType: Purchase Invoice,Supplier Address,Beszállító címe
DocType: Contact Us Settings,Address Line 2,2. cím sor
-DocType: ToDo,Reference,Hivatkozás
+DocType: ToDo,Reference,Kapcsolat
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,Perforáló
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,Out Mennyiség
apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,Szabályok számítani a szállítási költség egy eladó
apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,Sorozat kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,Pénzügyi Szolgáltatások
-DocType: Opportunity,Sales,Sales
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,Pénzügyi szolgáltatások
+DocType: Opportunity,Sales,Értékesítés
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Cr,Kr
DocType: Customer,Default Receivable Accounts,Default Követelés számlák
@@ -2853,8 +2853,8 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +567,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Employee)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,Szinterezés
-DocType: Journal Entry,Pay To / Recd From,Fizessen A / recD A
-DocType: Naming Series,Setup Series,Beállítás Series
+DocType: Journal Entry,Pay To / Recd From,Fizetni / követelni tőle
+DocType: Naming Series,Setup Series,Sorszámozás beállítása
DocType: Supplier,Contact HTML,Kapcsolattartó HTML leírása
DocType: Landed Cost Voucher,Purchase Receipts,Vásárlási bevételek
DocType: Payment Reconciliation,Maximum Amount,Maximális összeg
@@ -2873,12 +2873,12 @@
apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Telepítés rekordot a Serial No.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Continuous casting,Folyamatos öntés
sites/assets/js/erpnext.min.js +6,Please specify a,Kérem adjon meg egy
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Tedd vásárlási számla
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Beszerzési számla készítése
DocType: Offer Letter,Awaiting Response,Várom a választ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Cold sizing,Hideg méretezés
DocType: Salary Slip,Earning & Deduction,Kereset és levonás
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,Account {0} nem lehet Group
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +257,Region,Vidék
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +257,Region,Régió
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
DocType: Holiday List,Weekly Off,Heti Off
@@ -2889,10 +2889,10 @@
DocType: Serial No,Creation Time,Létrehozás ideje
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Összes bevétel
,Monthly Attendance Sheet,Havi jelenléti ív
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,Nem található rekord
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,Nem található bejegyzés
apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center kötelező tétel {2}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,Account {0} inaktív
-DocType: GL Entry,Is Advance,Az Advance
+DocType: GL Entry,Is Advance,Ez előleg?
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Jelenléti Dátum és jelenlét a mai napig kötelező
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a ""alvállalkozói"", mint Igen vagy Nem"
DocType: Sales Team,Contact No.,Kapcsolattartó szám
@@ -2901,9 +2901,9 @@
DocType: Features Setup,Sales Discounts,Értékesítési Kedvezmények
DocType: Hub Settings,Seller Country,Eladó Ország
DocType: Authorization Rule,Authorization Rule,Jóváhagyási szabály
-DocType: Sales Invoice,Terms and Conditions Details,Feltételek Részletek
+DocType: Sales Invoice,Terms and Conditions Details,Általános szerződési feltételek részletei
apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,Műszaki adatok
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Értékesítési adók és illetékek Template
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Értékesítési adók és költségek sablon
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,Ruházat és kiegészítők
DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Kötelező, ha Stock tétel ""Igen"". Szintén az alapértelmezett raktár, ahol fenntartva mennyiség beállítását a Vevői rendelés."
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,Számú rendelés
@@ -2929,7 +2929,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +144,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Jogi költségek
DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto érdekében jön létre pl 05, 28 stb"
-DocType: Sales Invoice,Posting Time,Kiküldetés ideje
+DocType: Sales Invoice,Posting Time,Rögzítés ideje
DocType: Sales Order,% Amount Billed,% mennyiség számlázva
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon költségek
DocType: Sales Partner,Logo,Logo
@@ -2945,7 +2945,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: Parent véve {1} nem tartozik a cég: {2}
apps/erpnext/erpnext/setup/doctype/company/company.js +33,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi ügylet a vállalattal kapcsolatos!
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Honing,Hónolás
-DocType: Serial No,"Only Serial Nos with status ""Available"" can be delivered.","Csak Serial Nos a status ""Elérhető"" lehet szállítani."
+DocType: Serial No,"Only Serial Nos with status ""Available"" can be delivered.",Csak az 'Elérhető' állapotú sorozatszám szállítható ki.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +53,Probation,Próbaidő
apps/erpnext/erpnext/stock/doctype/item/item.py +94,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
DocType: Feed,Full Name,Teljes név
@@ -2967,10 +2967,10 @@
DocType: Cost Center,Add rows to set annual budgets on Accounts.,Add sorok beállítani éves költségvetésekben számlák.
DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Quarrying,Kőfejtés
-DocType: Production Order,Total Operating Cost,Teljes működési költségek
+DocType: Production Order,Total Operating Cost,Teljes működési költség
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +153,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Minden Kapcsolattartó.
-DocType: Newsletter,Test Email Id,Test Email Id
+DocType: Newsletter,Test Email Id,Teszt email azonosítója
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Abbreviation,Cég rövidítése
DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Ha követed Minőség-ellenőrzési. Lehetővé teszi a tétel QA szükség, és QA Nem a vásárláskor kapott nyugtát"
DocType: GL Entry,Party Type,Párt Type
@@ -2981,12 +2981,12 @@
apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Fizetés sablon mester.
DocType: Leave Type,Max Days Leave Allowed,Max nap szabadságra hozhatja
DocType: Payment Tool,Set Matching Amounts,Állítsa Matching összegek
-DocType: Purchase Invoice,Taxes and Charges Added,Adók és Illetékek Hozzáadott
+DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadása
,Sales Funnel,Értékesítési csatorna
apps/erpnext/erpnext/shopping_cart/utils.py +34,Cart,Szekér
,Qty to Transfer,Mennyiség Transfer
apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Idézetek a vezetéket vagy ügyfelek.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Szerep szerkesztheti lefagyasztott
+DocType: Stock Settings,Role Allowed to edit frozen stock,Zárolt készlet szerkesztésének engedélyezése ennek a beosztásnak
,Territory Target Variance Item Group-Wise,Terület Cél Variance tétel Group-Wise
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Minden vásárlói csoport
apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
@@ -2994,20 +2994,20 @@
DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista Rate (Társaság Currency)
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',"{0} {1} állapota ""áll '"
DocType: Account,Temporary,Ideiglenes
-DocType: Address,Preferred Billing Address,Előnyben Számlázási cím
+DocType: Address,Preferred Billing Address,Ez legyen a számlázási cím is
DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,Titkár
DocType: Serial No,Distinct unit of an Item,Különálló egység Egy tétel
apps/erpnext/erpnext/config/setup.py +96,Item master.,Elem mester.
DocType: Pricing Rule,Buying,Beszerzés
DocType: HR Settings,Employee Records to be created by,Munkavállalói Records által létrehozandó
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ezúttal Bejelentkezés Batch törölték.
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ez az Időnapló gyűjtő törölve lett.
DocType: Purchase Invoice,Apply Discount On,Alkalmazza kedvezmény
DocType: Salary Slip Earning,Salary Slip Earning,Fizetés Slip Earning
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,A hitelezők
DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Elem Wise Tax részlete
,Item-wise Price List Rate,Elem-bölcs árjegyzéke Rate
-DocType: Purchase Order Item,Supplier Quotation,Szállító Idézet
+DocType: Purchase Order Item,Supplier Quotation,Beszállítói ajánlat
DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavak lesz látható, ha menteni a stringet."
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,Vasalás
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} megállt
@@ -3015,31 +3015,31 @@
DocType: Lead,Add to calendar on this date,Hozzáadás a naptárhoz ezen a napon
apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ügyfél köteles
-DocType: Letter Head,Letter Head,FEJLÉCES
+DocType: Letter Head,Letter Head,Levél fejléc
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Shrink fitting,Shrink szerelés
DocType: Email Digest,Income / Expense,Bevételek / ráfordítások
-DocType: Employee,Personal Email,Személyes Email
+DocType: Employee,Personal Email,Személyes emailcím
apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ha engedélyezve van, a rendszer küldeni könyvelési tételek a leltár automatikusan."
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Brokerage,Ügynöki jutalék
DocType: Production Order Operation,"in Minutes
Updated via 'Time Log'","percben Frissítve keresztül ""Idő Log"""
-DocType: Customer,From Lead,Ólom
+DocType: Customer,From Lead,Célponttól
apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Megrendelések bocsátott termelés.
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Válassza ki Fiscal Year ...
DocType: Hub Settings,Name Token,Név Token
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Planing,Gyalulás
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Selling,Normál Ajánló
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
-DocType: Serial No,Out of Warranty,Out of Garancia
-DocType: BOM Replace Tool,Replace,Cserélje
+DocType: Serial No,Out of Warranty,Garanciaidőn túl
+DocType: BOM Replace Tool,Replace,Csere
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
DocType: Purchase Invoice Item,Project Name,Projekt neve
DocType: Workflow State,Edit,Szerkesztés
DocType: Journal Entry Account,If Income or Expense,Ha bevételként vagy ráfordításként
DocType: Email Digest,New Support Tickets,Új hibajegy
-DocType: Features Setup,Item Batch Nos,Elem Batch Nos
+DocType: Features Setup,Item Batch Nos,Anyag kötegszáma
DocType: Stock Ledger Entry,Stock Value Difference,Stock értékkülönbözet
DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetési Megbékélés Fizetés
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Adó eszközök
@@ -3047,7 +3047,7 @@
DocType: Contact Us Settings,Pincode,PIN-kód
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,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
DocType: Item,Moving Average,Mozgóátlag
-DocType: BOM Replace Tool,The BOM which will be replaced,"A BOM, amely helyettesíti"
+DocType: BOM Replace Tool,The BOM which will be replaced,"Az anyagjegyzék, ami le lesz cserélve mindenhol"
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 Stock UOM különböznie kell a jelenlegi állomány UOM
DocType: Account,Debit,Tartozás
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +32,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
@@ -3056,7 +3056,7 @@
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Kiemelkedő Amt
DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Célok tétel Group-bölcs erre a Sales Person.
DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Rendelni ezt a kérdést, használja a ""hozzárendelése"" gombra az oldalsávon."
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Stocks Régebbi mint [napok]
+DocType: Stock Settings,Freeze Stocks Older Than [Days],[napoknál] régebbi készlet zárolása
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.","Ha két vagy több árképzési szabályok megtalálhatók alapján a fenti feltételeknek, Priority alkalmazzák. Prioritás közötti szám 0-20, míg alapértelmezett érték nulla (üres). A magasabb szám azt jelenti, hogy elsőbbséget, ha több árképzési szabályok azonos feltételek mellett."
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,Against Invoice,Számla ellenében
apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Pénzügyi év: {0} nem létezik
@@ -3085,7 +3085,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,Rate (%),Ráta (%)
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year End Date,Üzleti év végén dátuma
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja kiszűrni alapján utalvány No, ha csoportosítva utalvány"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +502,Make Supplier Quotation,Tedd Szállító Idézet
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +502,Make Supplier Quotation,Beszállítói ajánlat készítése
DocType: Quality Inspection,Incoming,Bejövő
DocType: Item,Name and Description,Név és leírás
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.","Alapértelmezett mértékegység nem módosítható közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Változtatni az alapértelmezett UOM, használja a ""UOM Cserélje Utility"" szerszámot Stock modul."
@@ -3106,16 +3106,16 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Piecework,Darabszámra fizetett munka
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Átlagos vásárlási ráta
DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
-DocType: Employee,History In Company,Történelem Társaság
-DocType: Address,Shipping,Hajózás
-DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+DocType: Employee,History In Company,Előzmények a cégnél
+DocType: Address,Shipping,Szállítás
+DocType: Stock Ledger Entry,Stock Ledger Entry,Készlet könyvelés tétele
DocType: Department,Leave Block List,Hagyja 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,Elem {0} nem beállítás Serial Nos. Oszlop üresen kell
DocType: Accounts Settings,Accounts Settings,Könyvelés beállításai
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Berendezések és gépek
DocType: Item,You can enter the minimum quantity of this item to be ordered.,Megadhatja a minimális mennyiség Ezen tétel rendelhető.
-DocType: Sales Partner,Partner's Website,Partner weboldalán
-DocType: Opportunity,To Discuss,Tárgyal
+DocType: Sales Partner,Partner's Website,Partner weboldala
+DocType: Opportunity,To Discuss,Megvitatni
DocType: SMS Settings,SMS Settings,SMS beállítások
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Ideiglenes számlák
DocType: Payment Tool,Column Break 1,Oszloptörés 1
@@ -3137,15 +3137,15 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent véve {1} nem Bolong a cég {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Orsó befejező
DocType: Material Request,% of materials ordered against this Material Request,% -a Megrendelt anyagok ellen Material kérése
-DocType: BOM,Last Purchase Rate,Utolsó Purchase Rate
+DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
DocType: Account,Asset,Vagyontárgy
DocType: Project Task,Task ID,Feladat ID
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""MC""","pl. ""MC"""
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +75,Stock cannot exist for Item {0} since has variants,Állomány nem létezik tétel {0} óta van változatok
,Sales Person-wise Transaction Summary,Sales Person-bölcs Tranzakciós összefoglalása
-DocType: System Settings,Time Zone,Time Zone
+DocType: System Settings,Time Zone,Időzóna
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} nem létezik
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció a ERPNext Hub
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Distribution százalékok
apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,A kiválasztott elem nem lehet Batch
DocType: Delivery Note,% of materials delivered against this Delivery Note,% Anyagokat szállított ellen szállítólevél
@@ -3162,7 +3162,7 @@
apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
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'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Quality Management,Quality Management
-DocType: Production Planning Tool,Filter based on customer,Filter alapul vevő
+DocType: Production Planning Tool,Filter based on customer,A szűrő ügyfélen alapul
DocType: Payment Tool Detail,Against Voucher No,Ellen betétlapjának
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +46,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget tétel {0}"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Figyelmeztetés: Vevői {0} már létezik ellen ugyanazon megrendelés számát
@@ -3194,7 +3194,7 @@
DocType: Authorization Rule,Customer / Item Name,Vevő / cikknév
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial No kötelező tétel {0}
sites/assets/js/desk.min.js +536,Created By,Létrehozta
-DocType: Serial No,Under AMC,Alatt AMC
+DocType: Serial No,Under AMC,ÉKSz időn belül
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Elem értékelési kamatlábat újraszámolják tekintve landolt költsége utalvány összegét
apps/erpnext/erpnext/config/selling.py +65,Default settings for selling transactions.,Alapértelmezett beállítások eladási tranzakciókat.
DocType: BOM Replace Tool,Current BOM,Aktuális anyagjegyzék (mit)
@@ -3203,60 +3203,60 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Nyomtatás és álló
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,Csoport Node
DocType: Payment Reconciliation,Minimum Amount,Minimális összeg
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,Frissítés késztermékek
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,Késztermék frissítése
DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Automatikusan beállítja. Ha ennek az elemnek a változatok, akkor nem lehet kiválasztani a vevői rendelések stb"
DocType: Workstation,per hour,óránként
-apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},Sorozat {0} már használt {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},{0} sorszám már használva van itt: {1}
DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Véve a raktárban (Perpetual Inventory) jön létre e számla.
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban.
DocType: Company,Distribution,Nagykereskedelem
-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 +86,Project Manager,Projekt menedzser
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,Dispatch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max kedvezmény megengedett tétel: {0} {1}%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
DocType: Account,Receivable,Követelés
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Szerepet, amely lehetővé tette, hogy nyújtson be tranzakciók, amelyek meghaladják hitel határértékeket."
-DocType: Sales Invoice,Supplier Reference,Szállító Referencia
+DocType: Sales Invoice,Supplier Reference,Beszállító ajánlása
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.","Ha be van jelölve, BOM a részegység napirendi pontokat a szerzés nyersanyag. Ellenkező esetben minden részegység elemek fogják kezelni, mint a nyersanyag."
-DocType: Material Request,Material Issue,Anyag Issue
+DocType: Material Request,Material Issue,Anyag probléma
DocType: Hub Settings,Seller Description,Eladó Leírás
-DocType: Item,Is Stock Item,Van Stock tétel
+DocType: Item,Is Stock Item,Raktározandó anyag?
DocType: Shopping Cart Price List,Shopping Cart Price List,Kosár árjegyzéke
DocType: Employee Education,Qualification,Képesítés
-DocType: Item Price,Item Price,Elem Ár
+DocType: Item Price,Item Price,Elem ár
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +47,Soap & Detergent,Soap & Mosószer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +35,Motion Picture & Video,Motion Picture & Videó
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +35,Motion Picture & Video,Mozgókép és videó
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Rendezett
DocType: Company,Default Settings,Alapértelmezett beállítások
-DocType: Warehouse,Warehouse Name,Warehouse név
+DocType: Warehouse,Warehouse Name,Raktár neve
DocType: Naming Series,Select Transaction,Válassza a Tranzakció
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Kérjük, adja jóváhagyása Role vagy jóváhagyása Felhasználó"
DocType: Journal Entry,Write Off Entry,Írja Off Entry
-DocType: BOM,Rate Of Materials Based On,Szavazz alapuló anyagok
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatás Analtyics
+DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatási analitika
DocType: Journal Entry,eg. Cheque Number,pl. Csekk száma
apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +25,Company is missing in warehouses {0},Cég hiányát raktárakban {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Cserélje Utility
+DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Készlet mértékegység cserélő
DocType: POS Setting,Terms and Conditions,Általános Szerződési Feltételek
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},El kellene belüli pénzügyi évben. Feltételezve To Date = {0}
DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tart fenn magasság, súly, allergia, egészségügyi problémák stb"
DocType: Leave Block List,Applies to Company,Vonatkozik Társaság
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet mondani, mert be Stock Entry {0} létezik"
-DocType: Purchase Invoice,In Words,Szavakban
+DocType: Purchase Invoice,In Words,Szavakkal
apps/erpnext/erpnext/hr/doctype/employee/employee.py +204,Today is {0}'s birthday!,Ma van {0} 's születésnapját!
-DocType: Production Planning Tool,Material Request For Warehouse,Anyag kérés Warehouse
+DocType: Production Planning Tool,Material Request For Warehouse,Anyagigénylés raktárba
DocType: Sales Order Item,For Production,Termelés
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +107,Please enter sales order in the above table,"Kérjük, adja értékesítés érdekében a fenti táblázatban"
DocType: Project Task,View Task,Kilátás Feladat
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,A pénzügyi év kezdete
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Kérjük, adja vásárlás nyugtáinak"
-DocType: Sales Invoice,Get Advances Received,Get kapott előlegek
+DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címzettek
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {0}
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani a költségvetési évben alapértelmezettként, kattintson a ""Beállítás alapértelmezettként"""
apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Beállítás bejövő kiszolgáló támogatási email id. (Pl support@example.com)
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +35,Shortage Qty,Hiány Mennyiség
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}: Party típusa és fél köteles a követelések / kötelezettségek figyelembe {1}
-DocType: Salary Slip,Salary Slip,Fizetés Slip
+DocType: Salary Slip,Salary Slip,Bérlap
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Palástcsiszoló
DocType: Features Setup,To enable <b>Point of Sale</b> view,"Annak érdekében, hogy <b> Point of Sale </ b> nézetet"
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Máig"" van szükség"
@@ -3276,7 +3276,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} has already been received,Serial No {0} már beérkezett
,Requested Items To Be Transferred,Kérte az átvinni kívánt elemeket
DocType: Purchase Invoice,Recurring Id,Ismétlődő Id
-DocType: Customer,Sales Team Details,Értékesítési csapat Részletek
+DocType: Customer,Sales Team Details,Értékesítő csapat részletei
DocType: Expense Claim,Total Claimed Amount,Összesen követelt összeget
apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,A potenciális értékesítési lehetőségeinek.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Sick Leave,A betegszabadság
@@ -3284,7 +3284,7 @@
DocType: Delivery Note,Billing Address Name,Számlázási cím neve
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Department Stores,Áruházak
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +39,System Balance,Rendszer Balance
-DocType: Workflow,Is Active,Aktív
+DocType: Workflow,Is Active,Aktív?
apps/erpnext/erpnext/controllers/stock_controller.py +70,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárak
apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Mentse el a dokumentumot.
DocType: Account,Chargeable,Felszámítható
@@ -3292,7 +3292,7 @@
DocType: Company,Change Abbreviation,Change rövidítése
DocType: Workflow State,Primary,Elsődleges
DocType: Expense Claim Detail,Expense Date,Igénylés dátuma
-DocType: Item,Max Discount (%),Max kedvezmény (%)
+DocType: Item,Max Discount (%),Max. engedmény (%)
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +60,Last Order Amount,Utolsó megrendelés összege
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Blasting,Robbantás
DocType: Company,Warn,Figyelmeztet
@@ -3301,16 +3301,16 @@
DocType: BOM,Manufacturing User,Gyártás Felhasználó
DocType: Purchase Order,Raw Materials Supplied,Szállított alapanyagok
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}),"Összes értékelés ({0}) a gyártott vagy újracsomagolt tétel (ek) nem lehet kevesebb, mint a teljes értékelési nyersanyagok ({1})"
-DocType: Email Digest,New Projects,Új projektek
-DocType: Communication,Series,Sorozat
+DocType: Email Digest,New Projects,Új projekt
+DocType: Communication,Series,Sorszám
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,A Várható szállítás dátuma nem lehet korábbi mint a beszerzési rendelés dátuma
DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
DocType: Communication,Email,Email
DocType: Item Group,Item Classification,Elem osztályozás
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Business Development Manager
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartás látogatás célja
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartási látogatás célja
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Időszak
-,General Ledger,General Ledger
+,General Ledger,Főkönyvi számla
apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Kilátás vezet
DocType: Item Attribute Value,Attribute Value,Jellemző értéke
apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id-nek egyedinek kell lennie, ez már létezik: {0}"
@@ -3338,26 +3338,26 @@
DocType: Quality Inspection Reading,Quality Inspection Reading,Minőség-ellenőrzési 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.,"`Freeze Stocks Régebbi Than` kisebbnek kell lennie, mint% d nap."
-,Project wise Stock Tracking,Project bölcs Stock Tracking
+,Project wise Stock Tracking,Projekt raktárkészlet követése
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Karbantartási ütemterv {0} létezik elleni {0}
DocType: Stock Entry Detail,Actual Qty (at source/target),Tényleges Mennyiség (forrásnál / target)
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/config/hr.py +13,Employee records.,Munkavállalók adatait.
DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Egyezik összeköttetésben nem álló számlákat és a kifizetéseket.
-DocType: Email Digest,New Purchase Orders,Új Megrendelések
+DocType: Email Digest,New Purchase Orders,Új beszerzési rendelés
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Root cannot have a parent cost center,Root nem lehet egy szülő költséghely
DocType: Sales Invoice,C-Form Applicable,C-formában idéztük
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion részlete
+DocType: UOM Conversion Detail,UOM Conversion Detail,Mértékegység konvertálásának részlete
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +476,Keep it web friendly 900px (w) by 100px (h),Tartsa web barátságos 900px (w) által 100px (h)
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtát az olyan áru
DocType: Payment Tool,Get Outstanding Vouchers,Kiemelkedő utalványok
-DocType: Warranty Claim,Resolved By,Megoldódott
+DocType: Warranty Claim,Resolved By,Megoldotta
DocType: Appraisal,Start Date,Kezdés dátuma
sites/assets/js/desk.min.js +512,Value,Érték
apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Osztja levelek időszakra.
apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,Account {0}: Nem rendelhet magának szülői fiók
-DocType: Purchase Invoice Item,Price List Rate,Árlista Rate
+DocType: Purchase Invoice Item,Price List Rate,Árlista arány
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,Szállított Serial No {0} nem lehet törölni
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""raktáron"", vagy ""nincs raktáron"" alapján álló állomány ebben a raktárban."
apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Anyagjegyzék (BOM)
@@ -3370,7 +3370,7 @@
DocType: Backup Manager,Dropbox Access Allowed,Dropbox hozzáférés engedélyezve
DocType: Backup Manager,Weekly,Heti
DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pl. smsgateway.com/api/send_sms.cgi
-DocType: Maintenance Visit,Fully Completed,Hiánytalanul kitöltött
+DocType: Maintenance Visit,Fully Completed,Teljesen kész
DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Termékek lesz rendezve tömeg-kor alapértelmezett keresést. Nagyobb súlyuk-kor, annál nagyobb a termék jelenik meg a listában."
apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
DocType: Employee,Educational Qualification,Iskolai végzettség
@@ -3391,13 +3391,13 @@
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,Költséghelyek listája
,Requested Items To Be Ordered,A kért lapok kell megrendelni
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,Saját rendelések
-DocType: Price List,Price List Name,Ár Listanév
+DocType: Price List,Price List Name,Árlista neve
DocType: Time Log,For Manufacturing,For Manufacturing
DocType: BOM,Manufacturing,Gyártás
-,Ordered Items To Be Delivered,Megrendelt tételeket kell szállítani
+,Ordered Items To Be Delivered,Rendelt mennyiség szállításra
DocType: Account,Income,Jövedelem
,Setup Wizard,Beállítás varázsló
-DocType: Industry Type,Industry Type,Ipari Type
+DocType: Industry Type,Industry Type,Iparág
apps/erpnext/erpnext/templates/includes/cart.js +264,Something went wrong!,Valami hiba történt!
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
@@ -3414,19 +3414,19 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +36,Stock UOM updated for Item {0},Stock UOM frissített jogcím {0}
DocType: Company History,Year,Év
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +69,Please Update SMS Settings,"Kérjük, frissítsd SMS beállítások"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +34,Time Log {0} already billed,Idő Bejelentkezés {0} már kiszámlázott
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +34,Time Log {0} already billed,A(z) {0} időnapló már számlázva van
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Fedezetlen hitelek
DocType: Cost Center,Cost Center Name,Költségközpont neve
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Elem {0} Serial No {1} már telepítve
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +10,You can start by selecting backup frequency and granting access for sync,Akkor kezdje a biztonsági mentés gyakorisága és hozzáférés biztosításával sync
-DocType: Maintenance Schedule Detail,Scheduled Date,Tervezett időpontja
+DocType: Maintenance Schedule Detail,Scheduled Date,Ütemezett dátum
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Teljes befizetett Amt
DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Üzenetek nagyobb, mint 160 karakter kell bontani több üzenetet"
DocType: Purchase Receipt Item,Received and Accepted,Beérkezett és befogadott
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","Alacsonyabb a szám, annál nagyobb a prioritás a tételkód utótagot jön létre ezt az elemet attribútumát a tétel Variant"
-,Serial No Service Contract Expiry,Serial No Service Contract Lejárat
+,Serial No Service Contract Expiry,Sorozatszám karbantartási szerződés lejárati ideje
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employee can not be changed,Nem változtatható meg a munkavállaló
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,"Nem lehet hitel- és betéti ugyanazt, ugyanabban az időben"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
DocType: Naming Series,Help HTML,Súgó HTML
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Összesen weightage kijelölt kell 100%. Ez {0}
apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
@@ -3437,7 +3437,7 @@
DocType: Purchase Invoice,Contact,Kapcsolat
DocType: Features Setup,Exports,Export
DocType: Lead,Converted,Átalakított
-DocType: Item,Has Serial No,Van Serial No
+DocType: Item,Has Serial No,Lesz sorozatszáma?
DocType: Employee,Date of Issue,Probléma dátuma
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A {0} az {1}
DocType: Issue,Content Type,Tartalom típusa
@@ -3448,10 +3448,10 @@
DocType: Payment Reconciliation,Get Unreconciled Entries,Get Nem egyeztetett bejegyzés
DocType: Purchase Receipt,Date on which lorry started from supplier warehouse,"Dátum, amikor teherautóval kezdte a beszállító raktárban"
DocType: Cost Center,Budgets,Költségvetési
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Korszerűsített
+apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Frissítve
DocType: Employee,Emergency Contact Details,Sürgősségi Elérhetőségek
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it do?,Mit csinál?
-DocType: Delivery Note,To Warehouse,Hogy Warehouse
+DocType: Delivery Note,To Warehouse,Raktárba
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Account {0} adta meg többször költségvetési évben {1}
,Average Commission Rate,Átlagos jutalék mértéke
apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""Van Serial No"" nem lehet ""igen"" a nem-állomány elem"
@@ -3472,22 +3472,22 @@
DocType: Item,Default Purchase Account in which cost of the item will be debited.,Alapértelmezett Vásárlás Account amelyben bekerülési értéke levonásra kerül.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Lapping,Lappolás
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Napok óta utolsó rendelés
-DocType: Buying Settings,Naming Series,Elnevezése Series
+DocType: Buying Settings,Naming Series,Sorszámozási csoport
DocType: Leave Block List,Leave Block List Name,Hagyja Block List név
DocType: User,Enabled,Engedélyezve
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Eszközök
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},Szeretné benyújtani minden fizetés Slip a hónapban {0} és az év {1}
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import előfizetők
-DocType: Target Detail,Target Qty,Cél Mennyiség
+DocType: Target Detail,Target Qty,Cél menny.
DocType: Attendance,Present,Jelen
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Szállítólevélen {0} nem kell benyújtani
DocType: Notification Control,Sales Invoice Message,Értékesítési számlák Message
DocType: Email Digest,Income Booked,Jövedelem foglalás
DocType: Authorization Rule,Based On,Alapuló
-,Ordered Qty,Rendezett Mennyiség
-DocType: Stock Settings,Stock Frozen Upto,Stock Fagyasztott Upto
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt tevékenység / feladat.
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Létrehoz Fizetés Slips
+,Ordered Qty,Rendelt menny.
+DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt feladatok és tevékenységek.
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Bérlap generálása
apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} nem érvényes e-mail id
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Vásárlási ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"A kedvezménynek kisebbnek kell lennie, mint 100"
@@ -3496,12 +3496,12 @@
DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +55,Please set {0},"Kérjük, állítsa {0}"
DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
-DocType: Employee,Health Details,Egészségügyi Részletek
+DocType: Employee,Health Details,Egészségügyi adatok
DocType: Offer Letter,Offer Letter Terms,Ajánlat Letter feltételek
DocType: Features Setup,To track any installation or commissioning related work after sales,Nyomon követni minden olyan üzem vagy üzembe kapcsolatos munkát az értékesítés után
DocType: Project,Estimated Costing,Becsült Costing
DocType: Purchase Invoice Advance,Journal Entry Detail No,Naplókönyvelés Részlet No
-DocType: Employee External Work History,Salary,Fizetés
+DocType: Employee External Work History,Salary,Bér
DocType: Serial No,Delivery Document Type,Szállítási Document Type
DocType: Salary Manager,Submit all salary slips for the above selected criteria,Benyújtja az összes fizetése csúszik a fent kiválasztott kritériumoknak
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} szinkronizálva
@@ -3513,7 +3513,7 @@
apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampány név szükséges
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,Kerekítve
DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
-DocType: Purchase Receipt Item,Rejected Serial No,Elutasított Serial No
+DocType: Purchase Receipt Item,Rejected Serial No,Elutasított sorozatszám
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Deep drawing,Mélyhúzó
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","Kérjük, válasszon tétel, ahol ""Hát Stock tétel"" ""Nem"" és ""Van Sales Termék"" ""Igen"", és nincs más Sales BOM"
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Új hírlevél
@@ -3527,16 +3527,16 @@
DocType: Journal Entry Account,Amount,Összeg
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Riveting,Szegecselő
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék cserélve
-,Sales Analytics,Sales Analytics
+,Sales Analytics,Értékesítési analítika
DocType: Manufacturing Settings,Manufacturing Settings,Gyártás Beállítások
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Please enter default currency in Company Master,"Kérjük, adja alapértelmezett pénznem Company mester"
-DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
+DocType: Stock Entry Detail,Stock Entry Detail,Készlet mozgás részletei
apps/erpnext/erpnext/templates/includes/cart.js +286,You need to be logged in to view your cart.,"Be kell jelentkezned, hogy megtekinthesse a kosarába."
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +200,New Account Name,New Account Name
DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Szállított alapanyagok költsége
DocType: Selling Settings,Settings for Selling Module,Beállítások Értékesítés modul
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +68,Customer Service,Ügyfélszolgálat
-DocType: Item Customer Detail,Item Customer Detail,Elem Customer részlete
+DocType: Item Customer Detail,Item Customer Detail,Az elem vevőjének részletei
apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ajánlat jelölt munkát.
DocType: Notification Control,Prompt for Email on Submission of,Kérjen Email benyújtása
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Elem {0} kell lennie Stock tétel
@@ -3547,7 +3547,7 @@
DocType: Contact Us Settings,City,Város
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,Ultrahangos megmunkálás
apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sales Item,Elem {0} kell lennie Sales tétel
-DocType: Naming Series,Update Series Number,Frissítés Series száma
+DocType: Naming Series,Update Series Number,Sorszám frissítése
DocType: Account,Equity,Méltányosság
DocType: Task,Closing Date,Benyújtási határidő
DocType: Sales Order Item,Produced Quantity,"A termelt mennyiség,"
@@ -3558,7 +3558,7 @@
DocType: Purchase Order,% of materials received against this Purchase Order,% -a Beérkezett anyagok ellen Megrendelés
DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
-DocType: Production Order,Production Order,Gyártási rendelés
+DocType: Production Order,Production Order,Gyártásrendelés
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +242,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
DocType: Quotation Item,Against Docname,Ellen Docname
DocType: SMS Center,All Employee (Active),Minden dolgozó (Aktív)
@@ -3567,25 +3567,25 @@
DocType: BOM,Raw Material Cost,Nyersanyagköltsége
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.,"Adja tételek és tervezett Mennyiség amelynek meg szeretné emelni a gyártási megrendeléseket, vagy töltse le a nyersanyagok elemzésre."
-sites/assets/js/list.min.js +160,Gantt Chart,Gantt Chart
+sites/assets/js/list.min.js +160,Gantt Chart,Gantt diagram
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,Részidős
DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
DocType: Employee,Cheque,Csekk
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,Sorozat Frissítve
apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Report Type is mandatory,Report Type kötelező
-DocType: Item,Serial Number Series,Serial Number Series
+DocType: Item,Serial Number Series,Sorozatszám sorozat
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Retail & Wholesale,Kis- és nagykereskedelem
-DocType: Issue,First Responded On,Először válaszolt
+DocType: Issue,First Responded On,Első válasz időpontja
DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása Elem több csoportban
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +349,The First User: You,Az első felhasználó: You
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},Pénzügyi év kezdő dátuma és a pénzügyi év vége dátum már meghatározták Fiscal Year {0}
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Successfully Reconciled,Sikeresen Egyeztetett
DocType: Production Order,Planned End Date,Tervezett befejezési dátuma
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Amennyiben a tételek tárolt.
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ahol az anyagok tárolva vannak.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Számlázott összeg
DocType: Attendance,Attendance,Jelenléti
-DocType: Page,No,Nincs
+DocType: Page,No,Nem
DocType: BOM,Materials,Anyagok
DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ha nincs bejelölve, akkor a lista meg kell adni, hogy minden egyes részleg, ahol kell alkalmazni."
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +663,Make Delivery,Hogy a szállítás
@@ -3597,7 +3597,7 @@
apps/erpnext/erpnext/config/stock.py +125,Price List master.,Árlista mester.
DocType: Task,Review Date,Vélemény dátuma
DocType: DocPerm,Level,Szint
-DocType: Purchase Taxes and Charges,On Net Total,On Net Total
+DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,Cél raktár sorban {0} meg kell egyeznie a gyártási utasítás
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""Értesítési e-mail címek"" nem meghatározott ismétlődő% s"
@@ -3626,27 +3626,27 @@
DocType: Item,Default Warehouse,Alapértelmezett raktár
DocType: Task,Actual End Date (via Time Logs),Tényleges End Date (via Idő Napló)
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,"Kérjük, adja szülő költséghely"
-DocType: Delivery Note,Print Without Amount,Nyomtassa nélkül Összeg
+DocType: Delivery Note,Print Without Amount,Nyomtatás érték nélkül
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,"Adó kategóriák nem lehet az ""Értékelés"" vagy ""Értékelési és Total"", mint az összes elem nincsenek raktáron tételek"
-DocType: User,Last Name,Vezetéknév
-DocType: Web Page,Left,Balra
+DocType: User,Last Name,Keresztnév
+DocType: Web Page,Left,Elment
DocType: Event,All Day,Minden nap
DocType: Communication,Support Team,Support Team
-DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5)
-DocType: Contact Us Settings,State,Állam
+DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5–ből)
+DocType: Contact Us Settings,State,Állapot
DocType: Batch,Batch,Köteg
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,Egyensúly
DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (via költségtérítési igényeket)
-DocType: User,Gender,Nem
+DocType: User,Gender,Neme
DocType: Journal Entry,Debit Note,Terhelési értesítő
DocType: Stock Entry,As per Stock UOM,Mivel a per Stock UOM
apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nem járt le
-DocType: Journal Entry,Total Debit,Összesen Betéti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Értékesítői
+DocType: Journal Entry,Total Debit,Tartozás összesen
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Értékesítő
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +496,Unstop Purchase Order,Kidugaszol Megrendelés
DocType: Sales Invoice,Cold Calling,Hideg hívás (telemarketing)
-DocType: SMS Parameter,SMS Parameter,SMS Paraméter
-DocType: Maintenance Schedule Item,Half Yearly,Féléves
+DocType: SMS Parameter,SMS Parameter,SMS paraméter
+DocType: Maintenance Schedule Item,Half Yearly,Félévente
DocType: Lead,Blog Subscriber,Blog Előfizető
DocType: Email Digest,Income Year to Date,Jövedelem év eddigi
apps/erpnext/erpnext/config/setup.py +58,Create rules to restrict transactions based on values.,Készítse szabályok korlátozzák ügyletek alapján értékek.
@@ -3667,11 +3667,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Seaming,Szegélyterület
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),A vagyon (eszközök)
-DocType: Production Planning Tool,Filter based on item,Filter pontja alapján
+DocType: Production Planning Tool,Filter based on item,A szűrő cikken alapul
DocType: Fiscal Year,Year Start Date,Év Start Date
DocType: Attendance,Employee Name,Munkavállalói név
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit To account must be a liability account,Megterhelése figyelembe kell venni a felelősséget
-DocType: Sales Invoice,Rounded Total (Company Currency),Lekerekített Total (Társaság Currency)
+DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,"Nem burkolt csoporthoz, mert Account Type választja."
DocType: Purchase Common,Purchase Common,Vásárlási Közös
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
@@ -3681,21 +3681,21 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Munkavállalói juttatások
DocType: Sales Invoice,Is POS,POS
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +224,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
-DocType: Production Order,Manufactured Qty,Gyártott Mennyiség
+DocType: Production Order,Manufactured Qty,Gyártott menny.
DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills emelte az ügyfelek számára.
DocType: DocField,Default,Alapértelmezett
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt azonosító
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","""Igen"" kiválasztása lehetővé teszi, hogy ez a tétel megjelenik a megrendelés, a vásárláskor kapott nyugtát."
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} előfizetők hozzá
-DocType: Maintenance Schedule,Schedule,Menetrend
+DocType: Maintenance Schedule,Schedule,Ütemezés
DocType: Account,Parent Account,Szülő Account
DocType: Serial No,Available,Elérhető
DocType: Quality Inspection Reading,Reading 3,Reading 3
,Hub,Kerékagy
-DocType: GL Entry,Voucher Type,Utalvány típus
+DocType: GL Entry,Voucher Type,Bizonylat típusa
DocType: Expense Claim,Approved,Jóváhagyott
-DocType: Pricing Rule,Price,Ár
+DocType: Pricing Rule,Price,Árazás
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Igen"" ad egy egyedi azonosító, hogy minden entitás ez a tétel, amely megtekinthető a Serial No mester."
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Értékelési {0} létre Employee {1} az adott időpontban tartományban
@@ -3703,7 +3703,7 @@
DocType: Selling Settings,Campaign Naming By,Kampány Elnevezése a
DocType: Employee,Current Address Is,Jelenlegi cím
DocType: Address,Office,Iroda
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard jelentések
+apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Általános jelentések
apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Számviteli naplóbejegyzések.
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Hogy hozzon létre egy adószámlára
@@ -3720,42 +3720,42 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +558,From Supplier Quotation,A beszállító Idézet
DocType: Deduction Type,Deduction Type,Levonás típusa
DocType: Attendance,Half Day,Félnapos
-DocType: Serial No,Not Available,Nem áll rendelkezésre
-DocType: Pricing Rule,Min Qty,Min Mennyiség
-DocType: GL Entry,Transaction Date,Ügylet időpontja
+DocType: Serial No,Not Available,Nincs
+DocType: Pricing Rule,Min Qty,Min. menny.
+DocType: GL Entry,Transaction Date,Ügylet dátuma
DocType: Production Plan Item,Planned Qty,Tervezett Mennyiség
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +92,Total Tax,Teljes adó-
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +92,Total Tax,Összes adó
DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
-DocType: Purchase Invoice,Net Total (Company Currency),Teljes nettó (Társaság Currency)
+DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (a cég pénznemében)
DocType: Notification Control,Purchase Receipt Message,Vásárlási nyugta Message
DocType: Production Order,Actual Start Date,Tényleges kezdési dátum
DocType: Sales Order,% of materials delivered against this Sales Order,% Anyagokat szállított ellen Vevői
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Record elem mozgását.
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,Hírlevél List Előfizető
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Hírlevél előfizető
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Csaplyukvéső
DocType: Email Account,Service,Szolgáltatás
DocType: Hub Settings,Hub Settings,Hub Beállítások
-DocType: Project,Gross Margin %,A bruttó árrés%
-DocType: BOM,With Operations,Műveletek
+DocType: Project,Gross Margin %,A bruttó árrés %
+DocType: BOM,With Operations,Műveletek is
,Monthly Salary Register,Havi fizetés Regisztráció
apps/frappe/frappe/website/template.py +120,Next,Következő
DocType: Warranty Claim,If different than customer address,"Ha más, mint megrendelő címét"
DocType: BOM Operation,BOM Operation,BOM Operation
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electropolishing,Elektropolírozás
DocType: Purchase Taxes and Charges,On Previous Row Amount,On előző sor összege
-DocType: Email Digest,New Delivery Notes,Új Delivery Notes
+DocType: Email Digest,New Delivery Notes,Új szállítási megjegyzés
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +30,Please enter Payment Amount in atleast one row,"Kérjük, adja fizetési összeget adni legalább egy sorban"
apps/erpnext/erpnext/templates/pages/tickets.py +34,Please write something in subject and message!,"Kérjük, írjon valamit a tárgyat és az üzenetet!"
apps/erpnext/erpnext/config/accounts.py +143,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezésekor, célok stb"
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +190,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Row {0}: kifizetés összege nem lehet nagyobb, mint fennálló összeg"
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Idő napló nem számlázható
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Időnapló nem számlázható
apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","Elem {0} egy olyan sablon, kérjük, válasszon variánsai"
-DocType: System Settings,Localization,A honosítás
+DocType: System Settings,Localization,Honosítás
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +74,Net pay cannot be negative,Nettó fizetés nem lehet negatív
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +70,Please enter the Against Vouchers manually,"Kérjük, adja meg Against utalványok kézzel"
DocType: SMS Settings,Static Parameters,Statikus paraméterek
DocType: Purchase Order,Advance Paid,A kifizetett előleg
-DocType: Item,Item Tax,Elem adó
+DocType: Item,Item Tax,Az anyag adójának típusa
DocType: Expense Claim,Employees Email Id,Dolgozó emailcíme
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,A rövid lejáratú kötelezettségek
apps/erpnext/erpnext/config/crm.py +43,Send mass SMS to your contacts,Küldd tömeges SMS-ben a kapcsolatot
@@ -3767,13 +3767,13 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +127,Credit Card,Hitelkártya
DocType: BOM,Item to be manufactured or repacked,A tétel gyártott vagy újracsomagolt
apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciók.
-DocType: Purchase Invoice,Next Date,Next dátuma
-DocType: Employee Education,Major/Optional Subjects,Major / választható tantárgyak
+DocType: Purchase Invoice,Next Date,Következő dátum
+DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Kérjük, adja adók és illetékek"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Machining,Megmunkálás
DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Itt tart fenn a családi részleteket, mint a neve és foglalkozása szülő, házastárs és a gyermekek"
DocType: Hub Settings,Seller Name,Értékesítő neve
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Adók és Illetékek levonásra (Társaság Currency)
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Levont adók és költségek (a cég pénznemében)
DocType: Item Group,General Settings,Általános beállítások
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Deviza-és a devizaárfolyamok nem lehet ugyanazon
DocType: Stock Entry,Repack,Repack
@@ -3787,10 +3787,10 @@
DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése ünnepnapokon
DocType: Sales Order,Customer's Purchase Order Date,A Vevő rendelésének dátuma
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
-DocType: Packing Slip,Package Weight Details,Csomag súlya Részletek
+DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Válasszon egy csv fájlt
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Designer,Tervező
-apps/erpnext/erpnext/config/selling.py +116,Terms and Conditions Template,Feltételek Template
+apps/erpnext/erpnext/config/selling.py +116,Terms and Conditions Template,Általános szerződési feltételek sablon
DocType: Serial No,Delivery Details,Szállítási adatok
DocType: Party Type,Allow Children,Gyerek kapcsolat engedélyezése
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +362,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
@@ -3799,15 +3799,15 @@
DocType: Batch,Expiry Date,Lejárat dátuma
,Supplier Addresses and Contacts,Szállító Címek és Kapcsolatok
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Kérjük, válasszon Kategória első"
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt gazdája.
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektek.
DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem mutatnak szimbólum, mint $$ etc mellett valuták."
DocType: Supplier,Credit Days,Credit Napok
DocType: Leave Type,Is Carry Forward,Van átviszi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +496,Get Items from BOM,Hogy elemeket BOM
-DocType: Item,Lead Time Days,Átfutási idő Napok
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +496,Get Items from BOM,Elemek áthozása Anyagjegyzékből
+DocType: Item,Lead Time Days,Átfutási idő napokban
DocType: Backup Manager,Send Notifications To,Értesítést küld
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref dátuma
-DocType: Employee,Reason for Leaving,Miért ment el
+DocType: Employee,Reason for Leaving,Kilépés indoka
DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
DocType: GL Entry,Is Opening,Nyit
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 9a9e04f..d30268c 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -120,7 +120,7 @@
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,Induk Barang {0} harus tidak Stock Barang dan harus Item Penjualan
DocType: Item,Item Image (if not slideshow),Barang Gambar (jika tidak slideshow)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Sebuah Pelanggan ada dengan nama yang sama
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Jam Tingkat / 60) * Actual Waktu Operasi
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tingkat Jam / 60) * Waktu Operasi Sebenarnya
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,Biaya Produk Disampaikan
DocType: Blog Post,Guest,Tamu
@@ -381,7 +381,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,Masukkan Penerimaan Pembelian ada untuk melanjutkan
DocType: Landed Cost Item,Applicable Charges,Biaya yang berlaku
DocType: Workstation,Consumable Cost,Biaya Consumable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki peran 'Tinggalkan Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki peran 'Penerima Cuti'
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medis
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Alasan untuk kehilangan
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Tabung manik-manik
@@ -582,7 +582,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Publishing,Penerbitan
DocType: Activity Cost,Projects User,Proyek Pengguna
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Dikonsumsi
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam Faktur Rincian table
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
DocType: Material Request,Material Transfer,Material Transfer
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Pembukaan (Dr)
@@ -1000,7 +1000,7 @@
DocType: Salary Slip,Earnings,Penghasilan
DocType: Sales Invoice Advance,Sales Invoice Advance,Faktur Penjualan Muka
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Tidak ada yang meminta
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','Aktual Tanggal Mulai' tidak dapat lebih besar dari 'Aktual Tanggal Selesai'
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,Manajemen
apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Jenis kegiatan untuk Waktu Sheets
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Investasi casting
@@ -1011,7 +1011,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Biru
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,Node lebih lanjut dapat hanya dibuat di bawah tipe node 'Grup'
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} nos seri berlaku untuk Item {1}
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} nos seri valid untuk Item {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Item Code tidak dapat diubah untuk Serial Number
DocType: Purchase Order Item,UOM Conversion Factor,UOM Faktor Konversi
DocType: Stock Settings,Default Item Group,Default Item Grup
@@ -1198,7 +1198,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
DocType: Sales Invoice,Sales BOM Help,Penjualan BOM Bantuan
DocType: Purchase Invoice,Contact Person,Contact Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"""Ekspaktasi Tanggal Mulai 'tidak dapat lebih besar dari 'Ekspektasi Tanggal Selesai'"
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"""Harapan Tanggal Mulai' tidak dapat lebih besar dari 'Harpan Tanggal Selesai'"
DocType: Holiday List,Holidays,Liburan
DocType: Sales Order Item,Planned Quantity,Direncanakan Kuantitas
DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Pajak Barang
@@ -1508,7 +1508,7 @@
DocType: Offer Letter,Rejected,Ditolak
DocType: Pricing Rule,Brand,Merek
DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,Disampaikan %
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,% Terkirim
apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,Bundel item pada saat penjualan.
DocType: Sales Order Item,Actual Qty,Jumlah Aktual
DocType: Quality Inspection Reading,Reading 10,Membaca 10
@@ -1628,7 +1628,7 @@
DocType: Communication,Date,Tanggal
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulangi Pendapatan Pelanggan
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.,Duduk diam sementara sistem anda sedang setup. Ini mungkin memerlukan beberapa saat.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki peran 'Beban Approver'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki peran 'Penerima Pengeluaran'
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Pasangkan
DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
DocType: Maintenance Schedule Detail,Actual Date,Tanggal Aktual
@@ -1952,7 +1952,7 @@
DocType: Print Settings,Modern,Modern
DocType: Communication,Replied,Menjawab
DocType: Payment Tool,Total Payment Amount,Jumlah Total Pembayaran
-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}) tidak dapat lebih besar dari yang direncanakan quanitity ({2}) dalam Produksi Orde {3}
+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}) tidak dapat lebih besar dari jumlah yang direncanakan ({2}) di Pesanan Produksi {3}
DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
DocType: Newsletter,Test,tes
@@ -2086,7 +2086,7 @@
DocType: Sales Order,Billing Status,Status Penagihan
DocType: Backup Manager,Backup Right Now,Backup Sekarang Juga
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Beban utilitas
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-atas
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-ke atas
DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
DocType: Notification Control,Sales Order Message,Sales Order Pesan
apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nilai Default seperti Perusahaan, Mata Uang, Tahun Anggaran Current, dll"
@@ -2485,13 +2485,13 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Barang
-DocType: Sales Order,% Delivered,Disampaikan %
+DocType: Sales Order,% Delivered,% Terkirim
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cerukan Bank Akun
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Membuat Slip Gaji
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Unstop
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pinjaman Aman
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Diabaikan:
-apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} tidak dapat dibeli dengan menggunakan Daftar Belanja
+apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} tidak dapat dibeli dengan menggunakan Keranjang Belanja
apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Mengagumkan
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo pembukaan 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,Tidak dapat menyetujui cuti karena Anda tidak berwenang untuk menyetujui daun di Blok Dates
@@ -2625,7 +2625,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa sama
apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Disampaikan
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Terkirim
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).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
DocType: Territory,Territory Targets,Target Wilayah
@@ -2968,7 +2968,7 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran Sampai Tanggal adalah wajib
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,Masukkan 'Apakah subkontrak' sebagai Ya atau Tidak
DocType: Sales Team,Contact No.,Hubungi Nomor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,'Laba Rugi' jenis account {0} tidak diperbolehkan dalam Pembukaan Entri
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Pembukaan
DocType: Workflow State,Time,Durasi
DocType: Features Setup,Sales Discounts,Penjualan Diskon
DocType: Hub Settings,Seller Country,Penjual Negara
@@ -3061,7 +3061,7 @@
DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit saham beku
,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Barang Group-Wise
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Semua Grup Pelanggan
-apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin catatan mata uang tidak diciptakan untuk {1} ke {} 2.
+apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} status 'Berhenti'
@@ -3421,7 +3421,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
DocType: Quality Inspection Reading,Quality Inspection Reading,Inspeksi Kualitas 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.,`Freeze Saham Lama Dari` harus lebih kecil dari% d hari.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stock yang sudah lebih lama dari` harus lebih kecil dari %d hari.
,Project wise Stock Tracking,Project Tracking Stock bijaksana
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Jadwal pemeliharaan {0} ada terhadap {0}
DocType: Stock Entry Detail,Actual Qty (at source/target),Jumlah Aktual (di sumber/target)
@@ -3538,7 +3538,7 @@
DocType: Delivery Note,To Warehouse,Untuk Gudang
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Akun {0} telah dimasukkan lebih dari sekali untuk tahun fiskal {1}
,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Seri' tidak bisa' Ya' untuk item non-saham"
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""Tanpa Nomor Seri' tidak bisa 'Ya' untuk item non-persediaan"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 33ee592..840ed3b 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -1,13 +1,13 @@
DocType: Employee,Salary Mode,給与モード
DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",シーズンを基準に追跡する場合、「月次配分」を選択してください
DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,すでに同期されたアイテム
-DocType: Purchase Order,"If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.",あなたが購入税および充満テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください。
+DocType: Purchase Order,"If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.",購入税および請求テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,この保証請求をキャンセルする前に材料訪問{0}をキャンセルしなくてはなりません
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consumer Products,消費者製品
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +72,Please select Party Type first,最初のパーティーの種類を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,アニーリング
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +72,Please select Party Type first,先に当事者タイプを選択してください
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,焼きなまし
DocType: Item,Customer Items,顧客アイテム
apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} can not be a ledger,アカウント{0}：親勘定{1}は元帳にすることができません
DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.comにアイテムを発行
@@ -31,7 +31,7 @@
DocType: Job Applicant,Job Applicant,求職者
apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,これ以上、結果はありません。
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,法務
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},実際の型税が行内のアイテム率に含めることはできません{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},「実際」タイプの税は行{0}内のアイテム額に含めることはできません
DocType: C-Form,Customer,顧客
DocType: Purchase Receipt Item,Required By,要求元
DocType: Department,Department,部門
@@ -40,7 +40,7 @@
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.",通貨、変換レート、輸出の合計、輸出総計などのような全ての輸出関連分野は、納品書、POS、見積書、納品書、受注書などで利用可能です
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 +143,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
-DocType: Manufacturing Settings,Default 10 mins,10分のデフォルト
+DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
DocType: Leave Type,Leave Type Name,休暇タイプ名
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,シリーズを正常に更新しました
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Stitching,縫い
@@ -50,7 +50,7 @@
DocType: SMS Center,All Supplier Contact,全てのサプライヤー連絡先
DocType: Quality Inspection Reading,Parameter,パラメータ
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +52,Please specify a Price List which is valid for Territory,地域で有効な価格表を指定してください
-apps/erpnext/erpnext/projects/doctype/project/project.py +35,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より小さくすることはできません
+apps/erpnext/erpnext/projects/doctype/project/project.py +35,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +235,Do really want to unstop production order:,次の製造指示を停止解除しますか？：
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,新しい休暇申請
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,銀行為替手形
@@ -95,7 +95,7 @@
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: Bin,Quantity Requested for Purchase,仕入要求数
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",2列、古い名前のための1つ、新しい名前のための1つでの.csvファイルを添付
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",古い名前、新しい名前の計2列となっている.csvファイルを添付してください
DocType: Packed Item,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.,欠員
@@ -121,7 +121,7 @@
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,親項目{0}取り寄せ商品であってはならないこと及び販売項目でなければなりません
DocType: Item,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名の顧客が存在します
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間レート/ 60）*実際の作動時間
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
DocType: SMS Log,SMS Log,SMSログ
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,納品済アイテムの費用
DocType: Blog Post,Guest,ゲスト
@@ -143,14 +143,14 @@
DocType: BOM,Total Cost,費用合計
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Reaming,リーミング
DocType: Email Digest,Stub,スタブ（断片）
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +8,Activity Log:,活動記録
+apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +8,Activity Log:,活動ログ：
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Real Estate,不動産
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,決算報告
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pharmaceuticals,医薬品
DocType: Expense Claim Detail,Claim Amount,請求額
DocType: Employee,Mr,氏
-DocType: Custom Script,Client,顧客
+DocType: Custom Script,Client,クライアント
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
DocType: Naming Series,Prefix,接頭辞
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,消耗品
@@ -161,18 +161,18 @@
DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,在庫経費
DocType: Newsletter,Email Sent?,メール送信済み？
-DocType: Journal Entry,Contra Entry,コントラエントリー
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,ショータイムログ
+DocType: Journal Entry,Contra Entry,逆仕訳
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,時間ログを表示
DocType: Email Digest,Bank/Cash Balance,銀行/現金残高
DocType: Delivery Note,Installation Status,設置ステータス
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
-DocType: Item,Supply Raw Materials for Purchase,購入のための供給原料
+DocType: Item,Supply Raw Materials for Purchase,購入のための原材料供給
apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,アイテム{0}は仕入アイテムでなければなりません
DocType: Upload Attendance,"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","テンプレートをダウンロードし、適切なデータを記入した後、変更したファイルを添付してください。
選択した期間内のすべての日付と従業員の組み合わせは、既存の出勤記録と一緒に、テンプレートに入ります"
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +496,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,請求書を送信すると更新されます。
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,請求書を提出すると更新されます。
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",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人事モジュール設定
DocType: SMS Center,SMS Center,SMSセンター
@@ -202,7 +202,7 @@
DocType: User,First Name,お名前（名）
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,セットアップが完了しました。再読み込みしています。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Full-mold casting,フルモールド鋳造
-DocType: Offer Letter,Select Terms and Conditions,利用規約を選択
+DocType: Offer Letter,Select Terms and Conditions,規約を選択
DocType: Email Digest,Payments made during the digest period,ダイジェスト期間中の支払
DocType: Production Planning Tool,Sales Orders,受注
DocType: Purchase Taxes and Charges,Valuation,評価
@@ -223,7 +223,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},行{1}の在庫アイテム{0}のために予約倉庫が必要です
DocType: Sales Invoice,Is Opening Entry,オープンエントリー
DocType: Supplier,Mention if non-standard receivable account applicable,非標準的な受取勘定該当する場合に言及
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,送信前に必要とされる倉庫用
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,提出前に必要とされる倉庫用
DocType: Sales Partner,Reseller,リセラー
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,「会社」を入力してください
DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
@@ -233,7 +233,7 @@
DocType: Lead,Address & Contact,住所・連絡先
apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,納品書を提出する際の在庫元帳エントリを作成
-DocType: Newsletter List,Total Subscribers,総登録
+DocType: Newsletter List,Total Subscribers,総登録者数
DocType: Lead,Contact Name,担当者名
DocType: Production Plan Item,SO Pending Qty,受注保留数量
DocType: Salary Manager,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
@@ -241,9 +241,9 @@
apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,仕入要求
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Double housing,ダブル住宅
DocType: Item,"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).",このアイテムの数量単位（kg、ユニット（個）、数、組）。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を送信可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +167,Leaves per Year,年ごとの葉
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +167,Leaves per Year,年次休暇
DocType: Time Log,Will be updated when batched.,バッチ処理されると更新されます。
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.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
@@ -305,7 +305,7 @@
DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","もし、ごhref=""#Sales Browser/Customer Group"">追加/編集</ A>"
DocType: Employee,External Work History,職歴（他社）
apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環参照エラー
-DocType: ToDo,Closed,非公開
+DocType: ToDo,Closed,クローズ
DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。
DocType: Lead,Industry,業種
DocType: Employee,Job Profile,職務内容
@@ -367,7 +367,7 @@
,Schedule Date,期日
DocType: Packed Item,Packed Item,梱包済アイテム
apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,購入取引のデフォルト設定
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},{1} - 活動コストは、活動タイプに対する従業員の{0}のために存在します
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},活動タイプ- {1}に対する従業員{0}用に活動費用が存在します
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.,顧客やサプライヤーのためにアカウントを作成しないでください。これらは、顧客/サプライヤのマスターから直接作成されます。
DocType: Currency Exchange,Currency Exchange,為替
DocType: Purchase Invoice Item,Item Name,アイテム名
@@ -402,7 +402,7 @@
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,最初の「会社」名を入力してください
DocType: BOM,Item Desription,アイテム説明
DocType: Buying Settings,Supplier Name,サプライヤー名
-DocType: Account,Is Group,あるグループ
+DocType: Account,Is Group,グループ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,熱成形
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,スリッター
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',「終了事例番号」は「開始事例番号」より前にはできません
@@ -422,7 +422,7 @@
DocType: Delivery Note,Billing Address,請求先住所
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,アイテムコードを入力してください
DocType: BOM,Costing,原価計算
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",チェックすると、既に印刷速度/印刷量が含まれるように、税額が考慮されます
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",チェックすると、税額が既に表示上の単価／額に含まれているものと見なされます
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,合計数量
DocType: Employee,Health Concerns,健康への懸念
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Unpaid,未払い
@@ -431,17 +431,17 @@
DocType: Features Setup,Imports,インポート
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,接着
DocType: Job Opening,Description of a Job Opening,求人の説明
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,出勤記録
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,出勤レコード
DocType: Bank Reconciliation,Journal Entries,仕訳
DocType: Sales Order Item,Used for Production Plan,生産計画に使用
DocType: System Settings,Loading...,読み込んでいます...
DocType: DocField,Password,パスワード
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Fused deposition modeling,熱溶解積層法
-DocType: Manufacturing Settings,Time Between Operations (in mins),（分単位）の操作の間の時間
+DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間の時間（分単位）
DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.",注：バックアップとファイルがGoogleドライブから削除されません。手動で削除する必要があります。
DocType: Customer,Buyer of Goods and Services.,物品・サービスのバイヤー
DocType: Journal Entry,Accounts Payable,買掛金
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,サブスクライバを追加します。
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,登録者を追加
sites/assets/js/erpnext.min.js +2,""" does not exists","""が存在しません"
DocType: Pricing Rule,Valid Upto,有効（〜まで）
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
@@ -480,7 +480,7 @@
DocType: BOM,Operating Cost,運用費
,Gross Profit,粗利益
DocType: Production Planning Tool,Material Requirement,材料要件
-DocType: Company,Delete Company Transactions,会社との取引を削除
+DocType: Company,Delete Company Transactions,会社の取引を削除
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,アイテム{0}は仕入アイテムではありません
apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
Email Address'",{0} は「通知メールアドレス」として無効なメールアドレスです
@@ -573,9 +573,9 @@
DocType: Production Order Operation,In minutes,分単位
DocType: Issue,Resolution Date,課題解決日
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
-DocType: Selling Settings,Customer Naming By,顧客名設定者
+DocType: Selling Settings,Customer Naming By,顧客名設定
apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,グループへの変換
-DocType: Activity Cost,Activity Type,活動の型
+DocType: Activity Cost,Activity Type,活動タイプ
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,納品済額
DocType: Sales Invoice,Packing List,梱包リスト
apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,サプライヤーに与えられた発注
@@ -613,7 +613,7 @@
DocType: Employee,Provide email id registered in company,会社に登録されたメールアドレスを提供
DocType: Hub Settings,Seller City,販売者の市区町村
DocType: Email Digest,Next email will be sent on:,次の電子メール送信先：
-DocType: Offer Letter Term,Offer Letter Term,レター用語を提供しています
+DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +23,Item {0} not found,アイテム{0}が見つかりません
DocType: Bin,Stock Value,在庫価値
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ツリー型
@@ -633,8 +633,8 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +197,Please enter Delivery Note No or Sales Invoice No to proceed,納品書番号か請求書番号を入力して次に進んでください
,Reserved,予約済
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you really want to UNSTOP,停止解除しますか？
-DocType: Purchase Order,Supply Raw Materials,供給原料
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,次の請求が生成される日（送信すると生成されます）
+DocType: Purchase Order,Supply Raw Materials,材料供給
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,次の請求が生成される日（提出すると生成されます）
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 +108,{0} is not a stock Item,{0}は在庫アイテムではありません
DocType: Mode of Payment Account,Default Account,デフォルトアカウント
@@ -694,7 +694,7 @@
税率の異なる「アイテム（複数）」がある場合、アイテムマスタで「アイテムごとの税率」テーブルを追加しなければなりません。
＃＃＃＃表の説明
1. 計算タイプ：
-・「総計」（基本的な計の合計）
+・「差引計」（基本的な計の合計）
・「前行の計」（税・費用累計用）このオプションを選択した場合、税額は（税テーブルの）前行の率で適用されます。
・「実費」（前述の通り）
2. 科目：
@@ -707,7 +707,7 @@
税率
6. 額：
税額
-7. 合計：
+7. 計：
ここまでの累計額
8. 入力行：
「前行の計」に対して計算基準となる行番号を選択することができます（デフォルトは「前行」です）
@@ -728,17 +728,17 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Hemming,縁取り
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +64,Please enter Item first,最初のアイテムを入力してください
DocType: Account,Liability,負債
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額は、行{0}での請求額を超えることはできません。
-DocType: Company,Default Cost of Goods Sold Account,製品販売アカウントのデフォルトコスト
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
+DocType: Company,Default Cost of Goods Sold Account,製品販売アカウントのデフォルト費用
apps/erpnext/erpnext/stock/get_item_details.py +238,Price List not selected,価格表が選択されていません
DocType: Employee,Family Background,家族構成
DocType: Salary Manager,Send Email,メールを送信
apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,権限がありませんん
DocType: Company,Default Bank Account,デフォルト銀行口座
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first",パーティーに基づいてフィルタリングするには、最初のパーティーの種類を選択
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,番号
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,私の請求書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,自分の請求書
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,従業員が見つかりません
DocType: Purchase Order,Stopped,停止
DocType: SMS Center,All Customer Contact,全ての顧客連絡先
@@ -761,14 +761,14 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
DocType: Upload Attendance,Import Attendance,出勤インポート
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
-DocType: Salary Manager,Activity Log,活動記録
+DocType: Salary Manager,Activity Log,活動ログ
apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,純損益
apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
DocType: Production Order,Item To Manufacture,製造するアイテム
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,金型鋳造
DocType: Sales Order Item,Projected Qty,投影数量
DocType: Sales Invoice,Payment Due Date,支払期日
-DocType: Newsletter,Newsletter Manager,ニュースレターマネージャ
+DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
DocType: Notification Control,Delivery Note Message,納品書のメッセージ
DocType: Expense Claim,Expenses,経費
,Purchase Receipt Trends,領収書傾向
@@ -804,13 +804,13 @@
DocType: Naming Series,Update Series,シリーズ更新
DocType: Supplier Quotation,Is Subcontracted,下請け
DocType: Item Attribute,Item Attribute Values,アイテムの属性値
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,見るサブスクライバ
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,登録者表示
DocType: Purchase Invoice Item,Purchase Receipt,領収書
,Received Items To Be Billed,支払予定受領アイテム
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Abrasive blasting,吹き付け加工
DocType: Employee,Ms,女史
apps/erpnext/erpnext/config/accounts.py +138,Currency exchange rate 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},操作{1}のための次の{0}日でタイムスロットを見つけることができません。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +242,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
DocType: Production Order,Plan material for sub-assemblies,部分組立品材料計画
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +423,BOM {0} must be active,部品表{0}はアクティブでなければなりません
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.js +22,Set Status as Available,ステータスを「利用可」に設定
@@ -855,17 +855,17 @@
DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接収入
DocType: Contact Us Settings,Address Line 1,住所 1行目
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,分散
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,差違
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +390,Company Name,（会社名）
DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +508,Select Item for Transfer,転送のための項目を選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +508,Select Item for Transfer,配送のためのアイテムを選択
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: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
DocType: Pricing Rule,Max Qty,最大数量
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,化学
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
-DocType: Salary Manager,Select Payroll Year and Month,給与年と月を選択
+DocType: Salary Manager,Select Payroll Year and Month,賃金台帳 年と月を選択
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""",タイプの）子の追加にクリックして（「バンク」を適切なグループ（ファンドの通常のアプリケーション>流動資産>銀行口座に移動して、新しいアカウントを作成
DocType: Workstation,Electricity Cost,電気代
DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
@@ -900,7 +900,7 @@
DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,輸入費用領収書
DocType: Packing Slip Item,Packing Slip Item,梱包伝票項目
DocType: POS Setting,Cash/Bank Account,現金/銀行口座
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,数量または値の変化を伴わない項目を削除しました。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
DocType: Delivery Note,Delivery To,納品先
DocType: Production Planning Tool,Get Sales Orders,注文を取得
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
@@ -909,13 +909,13 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Filing,ファイリング
apps/erpnext/erpnext/templates/form_grid/item_grid.html +67,Discount,割引
DocType: Features Setup,Purchase Discounts,仕入割引
-DocType: Stock Entry,This will override Difference Account in Item,これは、アイテムの差異勘定をオーバーライドします
+DocType: Stock Entry,This will override Difference Account in Item,これはアイテムの差異勘定を上書きします
DocType: Workstation,Wages,賃金
-DocType: Time Log,Will be updated only if Time Log is 'Billable',タイムログは、「請求可能」である場合にのみ更新されます
+DocType: Time Log,Will be updated only if Time Log is 'Billable',時間ログは「請求可能」である場合にのみ更新されます
DocType: Project,Internal,内部
DocType: Task,Urgent,緊急
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},テーブルの行{0}の有効な行IDを指定してください。{1}
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +76,This Time Log conflicts with {0} for {1},この時間のログは、{0} {1}のためにと競合します
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},テーブル{1}内の行{0}の有効な行IDを指定してください
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +76,This Time Log conflicts with {0} for {1},この時間ログは、{1}の{0}と衝突します
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**.
The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
@@ -965,7 +965,7 @@
apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
DocType: Journal Entry Account,Against Purchase Invoice,対仕入請求書
apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
-DocType: Time Log Batch,updated via Time Logs,タイムログ経由でアップデート
+DocType: Time Log Batch,updated via Time Logs,時間ログ経由で更新
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齢
apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,次に進んでショッピングカートに何かを追加しましょう
DocType: Opportunity,Your sales person who will contact the customer in future,顧客を訪問する営業担当者
@@ -980,7 +980,7 @@
DocType: Upload Attendance,Attendance From Date,出勤開始日
DocType: Appraisal Template Goal,Key Performance Area,重要実行分野
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,輸送
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1}は送信しなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1}は提出しなければなりません
DocType: SMS Center,Total Characters,文字数合計
apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-フォーム請求書の詳細
@@ -1009,7 +1009,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,要求するものがありません
apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,マネジメント
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,タイムシートの活動タイプ
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,タイムシート用活動タイプ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,インベストメント鋳造
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +45,Either debit or credit amount is required for {0},{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""",これは派生のアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、派生のアイテムコードは、「T-SHIRT-SM」になります
@@ -1023,12 +1023,12 @@
DocType: Purchase Order Item,UOM Conversion Factor,数量単位の変換係数
DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Laminated object manufacturing,被ラミネート体の製造
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,サプライヤーデータベース。
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,サプライヤーデータベース
DocType: Account,Balance Sheet,貸借対照表
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +596,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Stretch forming,成形ストレッチ
DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,営業担当者には、顧客訪問日にリマインドが表示されます。
-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",またアカウントはグループの下で行うことができますが、エントリは、非グループに対して行うことができます
+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",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税その他給与控除
DocType: Lead,Lead,リード
DocType: Email Digest,Payables,買掛金
@@ -1046,7 +1046,7 @@
DocType: Payment Reconciliation,Unreconciled Payment Details,未照合支払いの詳細
DocType: Global Defaults,Current Fiscal Year,現在の会計年度
DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
-DocType: Lead,Call,呼び出します
+DocType: Lead,Call,電話
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,「エントリ」は空にできません
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},行{0}は{1}と重複しています
,Trial Balance,試算表
@@ -1059,7 +1059,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,"元帳の表示
"
DocType: Cost Center,Lft,左
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最古の
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
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",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
DocType: Sales Order,Delivery Status,納品ステータス
DocType: Production Order,Manufacture against Sales Order,受注に対する製造
@@ -1079,7 +1079,7 @@
DocType: Production Order,Qty To Manufacture,製造数
DocType: Buying Settings,Maintain same rate throughout purchase cycle,仕入サイクル全体で同じレートを維持
DocType: Opportunity Item,Opportunity Item,機会アイテム
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,一時的開口部
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,仮勘定期首
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
,Employee Leave Balance,従業員の残休暇数
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
@@ -1095,7 +1095,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,受注{0}は有効ではありません
DocType: Email Digest,New Stock Entries,新しい在庫エントリー
apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged",企業はマージできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,小さな
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,S
DocType: Employee,Employee Number,従業員番号
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
DocType: Material Request,% Completed,% 完了
@@ -1103,7 +1103,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,勘定科目{0}を作成しました
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Green,グリーン
DocType: Sales Order Item,Discount(%),割引（％）
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,達成合計
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,達成計
DocType: Employee,Place of Issue,発生場所
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +54,Contract,契約書
DocType: Report,Disabled,無効
@@ -1122,7 +1122,7 @@
DocType: Serial No,Serial No Details,シリアル番号詳細
DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,納品書{0}は送信されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,納品書{0}は提出されていません
apps/erpnext/erpnext/stock/get_item_details.py +137,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
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.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
@@ -1138,10 +1138,10 @@
DocType: DocType,Transaction,取引
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：このコストセンターはグループです。グループに対する会計エントリーを作成することはできません。
apps/erpnext/erpnext/config/projects.py +43,Tools,ツール
-DocType: Sales Taxes and Charges Template,Valid For Territories,北方領土の有効な
+DocType: Sales Taxes and Charges Template,Valid For Territories,有効な地域
DocType: Item,Website Item Groups,ウェブサイトのアイテムグループ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Production order number is mandatory for stock entry purpose manufacture,在庫エントリー目的の製造には製造指示番号が必須です
-DocType: Purchase Invoice,Total (Company Currency),合計（会社通貨）
+DocType: Purchase Invoice,Total (Company Currency),計（会社通貨）
DocType: Applicable Territory,Applicable Territory,適切な地域
apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,シリアル番号{0}は複数回入力されています
DocType: Journal Entry,Journal Entry,仕訳
@@ -1152,10 +1152,10 @@
sites/assets/js/desk.min.js +536,Comments,コメント
DocType: Salary Slip,Bank Account No.,銀行口座番号
DocType: Naming Series,This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +167,Valuation Rate required for Item {0},アイテム{0}に評価率が必要です
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +167,Valuation Rate required for Item {0},アイテム{0}に評価額が必要です
DocType: Quality Inspection Reading,Reading 8,報告要素8
DocType: Sales Partner,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'",合計{0}すべての項目にあなたが 'に基づいて料金を配布します」変更する必要がありますが、ゼロであります
+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'",全てのアイテムの合計{0}がゼロです。「支払按分参照元」を変更してください
DocType: Purchase Invoice,Taxes and Charges Calculation,租税公課計算
DocType: BOM Operation,Workstation,作業所
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +107,Hardware,ハードウェア
@@ -1174,11 +1174,11 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +196,Item Variants {0} deleted,アイテム派生{0}を削除しました
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食べ物
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,エイジングレンジ３
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +127,You can make a time log only against a submitted production order,時間ログは登録された製造指示に対してのみ作成できます
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +127,You can make a time log only against a submitted production order,時間ログは提出済の製造指示に対してのみ作成できます
DocType: Maintenance Schedule Item,No of Visits,訪問なし
DocType: Cost Center,old_parent,old_parent
apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",連絡先・リードへのニュースレター
-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}です
+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}になっています
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +368,Operations cannot be left blank.,作業は空白にできません
,Delivered Items To Be Billed,未入金の納品済アイテム
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
@@ -1190,7 +1190,7 @@
DocType: Address,Utilities,ユーティリティー
DocType: Purchase Invoice Item,Accounting,会計
DocType: Features Setup,Features Setup,機能設定
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ビューオファーレター
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,雇用契約書を表示
DocType: Sales BOM,Sales BOM,販売部品表
DocType: Communication,Communication,コミュニケーション
DocType: Item,Is Service Item,サービスアイテム
@@ -1210,7 +1210,7 @@
DocType: Holiday List,Holidays,休日
DocType: Sales Order Item,Planned Quantity,計画数
DocType: Purchase Invoice Item,Item Tax Amount,アイテムごとの税額
-DocType: Supplier Quotation,Get Terms and Conditions,利用規約を取得
+DocType: Supplier Quotation,Get Terms and Conditions,規約を取得
DocType: Leave Control Panel,Leave blank if considered for all designations,全指定を対象にする場合は空白のままにします
apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +165,Max: {0},最大：{0}
@@ -1220,7 +1220,7 @@
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,購入金額
DocType: Sales Invoice,Shipping Address Name,配送先住所
apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,勘定科目表
-DocType: Material Request,Terms and Conditions Content,利用規約の内容
+DocType: Material Request,Terms and Conditions Content,規約の内容
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +506,cannot be greater than 100,100を超えることはできません
DocType: Purchase Receipt Item,Discount %,割引％
apps/erpnext/erpnext/stock/doctype/item/item.py +473,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
@@ -1270,19 +1270,19 @@
DocType: Item,Inventory,在庫
DocType: Item,Sales Details,販売明細
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Pinning,ピン止め
-DocType: Opportunity,With Items,アイテムと
+DocType: Opportunity,With Items,関連アイテム
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,In Qty,数量中
DocType: Notification Control,Expense Claim Rejected,経費請求が拒否
DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
-",次の請求書が生成される日付。これは、送信時に生成されます。
+",次の請求書が生成される日付。これは提出時に生成されます。
DocType: Item Attribute,Item Attribute,アイテム属性
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +100,Government,政府
DocType: Item,Re-order,再注文
DocType: Company,Services,サービス
-apps/erpnext/erpnext/accounts/report/financial_statements.py +149,Total ({0}),合計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +149,Total ({0}),計（{0}）
DocType: Cost Center,Parent Cost Center,親コストセンター
DocType: Sales Invoice,Source,ソース
-DocType: Leave Type,Is Leave Without Pay,無給のままにされています
+DocType: Leave Type,Is Leave Without Pay,無給休暇
DocType: Purchase Order Item,"If Supplier Part Number exists for given Item, it gets stored here",与えられたアイテムにサプライヤー型番が存在している場合は、ここに格納されます
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +175,No records found in the Payment table,支払テーブルにレコードが見つかりません
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +403,Financial Year Start Date,会計年度の開始日
@@ -1297,7 +1297,7 @@
DocType: Pricing Rule,For Price List,価格表用
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,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.","アイテム{0}の仕入額が見つかりません、会計エントリ（費用）を記帳するために必要とされています。
-仕入価格リストに対するアイテム価格を記載してください。"
+仕入価格表に対するアイテム価格を記載してください。"
DocType: Maintenance Schedule,Schedules,スケジュール
DocType: Purchase Invoice Item,Net Amount,正味金額
DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
@@ -1338,7 +1338,7 @@
DocType: Address,Lead Name,リード名
,POS,POS
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0}が重複しています
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上をtranferすることは許されません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,梱包するアイテムはありません
DocType: Shipping Rule Condition,From Value,値から
@@ -1349,19 +1349,19 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +7,Centrifugal casting,遠心鋳造
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Magnetic field-assisted finishing,磁界アシスト仕上げ
DocType: Company,Default Holiday List,デフォルト休暇リスト
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +227,Task is Mandatory if Time Log is against a project,タイムログは、プロジェクトに対するものである場合、タスクは必須です
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +227,Task is Mandatory if Time Log is against a project,プロジェクトに対する時間ログがある場合、タスクが必須です
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,在庫負債
DocType: Purchase Receipt,Supplier Warehouse,サプライヤー倉庫
DocType: Opportunity,Contact Mobile No,連絡先携帯番号
DocType: Production Planning Tool,Select Sales Orders,受注を選択
,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない材料要求
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.,バーコードを使用してアイテムを追跡します。アイテムのバーコードをスキャンすることによって、納品書や請求書にアイテムを入力することができます。
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,見積を作ります
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,見積を作成
DocType: Dependent Task,Dependent Task,依存タスク
apps/erpnext/erpnext/stock/doctype/item/item.py +291,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
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.,納品書と請求書の両方を入力することはできません。どちらら一つを記入して下さい
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください。
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
DocType: SMS Center,Receiver List,受領者リスト
DocType: Payment Tool Detail,Payment Amount,支払金額
@@ -1382,36 +1382,36 @@
apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,追加
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
DocType: Accounts Settings,Credit Controller,与信管理
-DocType: Delivery Note,Vehicle Dispatch Date,配達開始日
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,経費請求は、プロジェクトに対するものである場合、タスクは必須です
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,領収書{0}は送信されていません
+DocType: Delivery Note,Vehicle Dispatch Date,配車日
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,経費請求は、プロジェクトに対するものである場合、タスクが必須です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
DocType: Company,Default Payable Account,デフォルト買掛金勘定
DocType: Party Type,Contacts,連絡先
apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,セットアップ完了
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}％銘打た
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}％支払済
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,予約数量
DocType: Party Account,Party Account,当事者アカウント
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,人事
DocType: Lead,Upper Income,高収益
-apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,私の問題
+apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,自分の課題
DocType: BOM Item,BOM Item,部品表アイテム
DocType: Appraisal,For Employee,従業員用
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,行{0}：支払額は負にすることはできません
-DocType: Expense Claim,Total Amount Reimbursed,総量は払い戻さ
+DocType: Expense Claim,Total Amount Reimbursed,総払戻額
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,圧入
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
DocType: Party Type,Default Price List,デフォルト価格表
DocType: Journal Entry,User Remark will be added to Auto Remark,ユーザー希望は自動備考に追加されます。
DocType: Payment Reconciliation,Payments,支払
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Hot isostatic pressing,熱間等静圧圧縮成形
-DocType: ToDo,Medium,ふつう
+DocType: ToDo,Medium,普通
DocType: Budget Detail,Budget Allocated,割当予算
,Customer Credit Balance,顧客貸方残高
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',「顧客ごと割引」には顧客が必要です
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,銀行支払日と履歴を更新してください。
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,銀行支払日と履歴を更新
DocType: Quotation,Term Details,用語解説
-DocType: Manufacturing Settings,Capacity Planning For (Days),（日）の容量計画
+DocType: Manufacturing Settings,Capacity Planning For (Days),キャパシティプランニング（日数）
DocType: Warranty Claim,Warranty Claim,保証請求
,Lead Details,リード詳細
DocType: Authorization Rule,Approving User,承認ユーザー
@@ -1441,12 +1441,12 @@
,Item Shortage Report,アイテム不足レポート
apps/erpnext/erpnext/stock/doctype/item/item.js +208,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される材料要求
-DocType: Journal Entry,View Details,詳細を閲覧
+DocType: Journal Entry,View Details,詳細を表示
apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,アイテムの１単位
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +160,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「送信済」でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +160,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「提出済」でなければなりません
DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,各在庫の動きを会計処理のエントリとして作成
DocType: Leave Allocation,Total Leaves Allocated,休暇割当合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},行はありません{0}に必要な倉庫
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
DocType: Employee,Date Of Retirement,退職日
DocType: Upload Attendance,Get Template,テンプレートを取得
DocType: Address,Postal,郵便
@@ -1466,7 +1466,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},アイテム{1}が存在するため倉庫{0}を削除することができません
DocType: Quotation,Order Type,注文タイプ
DocType: Purchase Invoice,Notification Email Address,通知電子メールアドレス
-DocType: Payment Tool,Find Invoices to Match,一致するように請求書を探します
+DocType: Payment Tool,Find Invoices to Match,一致する請求書を探す
,Item-wise Sales Register,アイテムごとの販売登録
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","例えば ""XYZ国立銀行 """
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,この税金が基本料金に含まれているか
@@ -1483,7 +1483,7 @@
sites/assets/js/desk.min.js +836,New {0},新しい{0}
DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,デフォルトのBOMは（{0}）このアイテムまたはそのテンプレートのアクティブである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
DocType: Employee,Leave Encashed?,現金化された休暇？
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +31,Opportunity From field is mandatory,機会元フィールドは必須です
DocType: Sales Invoice,Considered as an Opening Balance,開始残高として考慮
@@ -1495,12 +1495,12 @@
DocType: Sales Invoice Item,Customer's Item Code,顧客のアイテムコード
DocType: Stock Reconciliation,Stock Reconciliation,在庫棚卸
DocType: Territory,Territory Name,地域名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,送信する前に作業中の倉庫が必要です。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,求職者
DocType: Sales Invoice Item,Warehouse and Reference,倉庫と問い合わせ先
DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
DocType: Country,Country,国
-apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,アドレス
+apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,住所
DocType: Communication,Received,受領
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
@@ -1509,7 +1509,7 @@
DocType: DocField,Attach Image,画像を添付
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),この梱包の正味重量。 （自動にアイテムの正味重量の合計が計算されます。）
DocType: Stock Reconciliation Item,Leave blank if no change,変更しない場合は空白のままにします
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,製造のための時間のログ。
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,製造用の時間ログ
DocType: Item,Apply Warehouse-wise Reorder Level,倉庫ごとの再発注レベルを適用
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,部品表{0}を登録しなければなりません
DocType: Authorization Control,Authorization Control,認証コントロール
@@ -1536,7 +1536,7 @@
DocType: Packing Slip,To Package No.,対象梱包番号
DocType: DocType,System,システム
DocType: Warranty Claim,Issue Date,課題日
-DocType: Activity Cost,Activity Cost,活動コスト
+DocType: Activity Cost,Activity Cost,活動費用
DocType: Purchase Receipt Item Supplied,Consumed Qty,消費数量
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,通信
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します（「下書き」のみ）
@@ -1581,10 +1581,10 @@
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,アイテムグループツリー
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,アイテム{0}にはシリアル番号が設定されていません。アイテムマスタを確認してください。
DocType: Maintenance Visit,Maintenance Time,メンテナンス時間
-,Amount to Deliver,配信する額
+,Amount to Deliver,配送額
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,製品またはサービス
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,エラーが発生しました。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,盗聴
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,タップ加工
DocType: Naming Series,Current Value,現在の値
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},アイテムテンプレートは、在庫と変種を持つことはできません。倉庫{0}から在庫を削除してください。
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} 作成
@@ -1601,7 +1601,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,関税と税金
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +275,Please enter Reference date,基準日を入力してください
DocType: Item Website Specification,Table for Item that will be shown in Web Site,Webサイトに表示されたアイテムの表
-DocType: Purchase Order Item Supplied,Supplied Qty,提供される数量
+DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
DocType: Material Request Item,Material Request Item,材料要求アイテム
apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,アイテムグループのツリー
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,この請求タイプの行数以上の行番号を参照することはできません
@@ -1611,7 +1611,7 @@
DocType: Account,Frozen,凍結
,Open Production Orders,製造指示を開く
DocType: Installation Note,Installation Time,設置時間
-apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,この会社のためにすべてのトランザクションを削除します。
+apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,この会社の全ての取引を削除
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,"行 {0}：注文番号{3}には完成品{2}個が必要なため、作業{1}は完了していません。
時間ログから作業ステータスを更新してください"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
@@ -1622,7 +1622,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +256,Item {0} must be Sales or Service Item in {1},アイテム{0}は{1}での販売またはサービスでなければなりません
DocType: Item Group,Show In Website,ウェブサイトで表示
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +569,Group,グループ
-DocType: Task,Expected Time (in hours),（時間）予測時間
+DocType: Task,Expected Time (in hours),予定時間（時）
,Qty to Order,注文数
DocType: Sales Order,PO No,発注番号
apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,すべてのタスクのガントチャート
@@ -1654,7 +1654,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",このアイテムに製造指示を出すには、在庫アイテムでなければなりません。
DocType: Shipping Rule Condition,Shipping Amount,出荷量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,参加
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,入社
DocType: Authorization Rule,Above Value,値を上回る
,Pending Amount,保留中の金額
DocType: Purchase Invoice Item,Conversion Factor,換算係数
@@ -1670,7 +1670,7 @@
DocType: Bank Reconciliation,Include Reconciled Entries,照合済のエントリを含む
apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,財務アカウントのツリー
DocType: Leave Control Panel,Leave blank if considered for all employee types,全従業員タイプを対象にする場合は空白のままにします
-DocType: Landed Cost Voucher,Distribute Charges Based On,料金配分参照元
+DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分参照元
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません
DocType: HR Settings,HR Settings,人事設定
apps/frappe/frappe/config/setup.py +130,Printing,印刷
@@ -1679,8 +1679,8 @@
sites/assets/js/desk.min.js +684,and,＆
DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Sports,スポーツ
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,実費合計
-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.","記載された転記日時の、元／先倉庫での評価率と利用可能な在庫を取得します。
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,実費計
+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.","記載された転記日時の、元／先倉庫での評価額と利用可能な在庫を取得します。
アイテムにシリアル番号を付ける場合は、シリアル番号を入力した後、このボタンを押してください。"
apps/erpnext/erpnext/templates/includes/cart.js +288,Something went wrong.,問題が発生しました。
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Unit,単位
@@ -1690,7 +1690,7 @@
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,開始時刻は終了時刻より後にすることはできません
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,返品を保管する倉庫
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,会計年度終了日
-DocType: POS Setting,Price List,価格リスト
+DocType: POS Setting,Price List,価格表
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}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,経費請求
DocType: Email Digest,Support,サポート
@@ -1713,7 +1713,7 @@
DocType: Salary Slip,Total Deduction,控除合計
apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,次に進んでアドレスを追加してください
DocType: Quotation,Maintenance User,メンテナンスユーザー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,コスト更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,費用更新
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,停止解除してよろしいですか？
DocType: Employee,Date of Birth,生年月日
DocType: Salary Manager,Salary Manager,給与マネージャー
@@ -1738,12 +1738,12 @@
DocType: Supplier Quotation,Manufacturing Manager,製造マネージャー
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +201,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,梱包ごとに納品書を分割
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Shipments,出荷台数
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Shipments,出荷
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Dip molding,ディップ成形
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが送信されなければなりません
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが提出されなければなりません
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +591,Setting Up,セットアップ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +90,Make Debit Note,借方票を作成
-DocType: Purchase Invoice,In Words (Company Currency),表記（会社通貨）内
+DocType: Purchase Invoice,In Words (Company Currency),文字表記（会社通貨）
DocType: Pricing Rule,Supplier,サプライヤー
DocType: C-Form,Quarter,四半期
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雑費
@@ -1768,7 +1768,7 @@
DocType: Purchase Invoice Item,Rate (Company Currency),レート（報告通貨）
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,その他
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Production might not be able to finish by the Expected Delivery Date.,納品予定日までに生産が終了しない可能性があります
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +19,Set as Stopped,停止として設定
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +19,Set as Stopped,停止に設定
DocType: POS Setting,Taxes and Charges,租税公課
DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",製品またはサービスは、購入・販売あるいは在庫です。
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,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
@@ -1785,7 +1785,7 @@
DocType: Purchase Receipt,Detailed Breakup of the totals,合計の詳細内訳
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},受注{1}に対する{0}
DocType: Account,Fixed Asset,固定資産
-DocType: Time Log Batch,Total Billing Amount,合計請求額
+DocType: Time Log Batch,Total Billing Amount,総請求額
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,売掛金勘定
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +140,No Updates For,アップデートがありません：
,Stock Balance,在庫残高
@@ -1809,11 +1809,11 @@
DocType: Company,Country Settings,国設定
DocType: Employee,Contact Details,連絡先の詳細
DocType: C-Form,Received Date,受信日
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",あなたが売上税および充満テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください。
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",販売租税公課テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください
DocType: Backup Manager,Upload Backups to Google Drive,Googleドライブへバックアップ
DocType: Stock Entry,Total Incoming Value,収入価値合計
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格リスト
-DocType: Offer Letter Term,Offer Term,オファー期間
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
+DocType: Offer Letter Term,Offer Term,雇用契約条件
DocType: Quality Inspection,Quality Manager,品質管理者
DocType: Job Applicant,Job Opening,求人
DocType: Payment Reconciliation,Payment Reconciliation,支払照合
@@ -1821,20 +1821,20 @@
DocType: Delivery Note,Date on which lorry started from your warehouse,倉庫から輸送が開始された日
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Technology,技術
DocType: Purchase Order,Supplier (vendor) name as entered in supplier master,サプライヤーマスターに入力されたサプライヤー（ベンダー）名
-DocType: Offer Letter,Offer Letter,内定通知
+DocType: Offer Letter,Offer Letter,雇用契約書
apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,材料要求（MRP）と製造指示を生成
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,請求額合計
-DocType: Time Log,To Time,時間
+DocType: Time Log,To Time,終了時間
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.",子ノードを追加するには、ツリーを展開し、増やしたいノードの下をクリックしてください
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +236,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
DocType: Production Order Operation,Completed Qty,完成した数量
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,価格表{0}は無効になっています
-DocType: Manufacturing Settings,Allow Overtime,残業を許可します
+DocType: Manufacturing Settings,Allow Overtime,残業を許可
apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,受注{0}は停止されました
DocType: Email Digest,New Leads,新規リード
-DocType: Stock Reconciliation Item,Current Valuation Rate,現在の評価レート
+DocType: Stock Reconciliation Item,Current Valuation Rate,現在の評価額
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,"Advance paid against {0} {1} cannot be greater \
than Grand Total {2}",{0} {1} に対する前払金は、総合計{2}より大きくすることはできません
DocType: Opportunity,Lost Reason,失われた理由
@@ -1844,7 +1844,7 @@
DocType: Quality Inspection,Sample Size,サンプルサイズ
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,全てのアイテムはすでに請求済みです
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
-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,さらなるコストセンターではグループの下で行うことができますが、エントリは、非グループに対して行うことができます
+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,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
DocType: Project,External,外部
DocType: Features Setup,Item Serial Nos,アイテムシリアル番号
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +8,Not Received,受領していません
@@ -1865,7 +1865,7 @@
DocType: Appraisal Goal,Appraisal Goal,査定目標
DocType: Event,Friday,金曜日
DocType: Time Log,Costing Amount,原価計算量
-DocType: Salary Manager,Submit Salary Slip,給与伝票を送信
+DocType: Salary Manager,Submit Salary Slip,給与伝票を提出
DocType: Salary Structure,Monthly Earning & Deduction,月次収益＆控除
apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,アイテム{0}の最大割引は {1}％です
DocType: Supplier,Address & Contacts,住所・連絡先
@@ -1882,7 +1882,7 @@
DocType: Journal Entry,Reference Number,参照番号
DocType: Employee,Employment Details,雇用の詳細
DocType: Employee,New Workplace,新しい職場
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,クローズとして設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,クローズに設定
apps/erpnext/erpnext/stock/get_item_details.py +104,No Item with Barcode {0},バーコード{0}のアイテムはありません
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ケース番号は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,営業チームと販売パートナー（チャネルパートナー）がある場合、それらはタグ付けされ、営業活動での貢献度を保持することができます
@@ -1895,7 +1895,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,移動
DocType: Leave Block List,Allow Users,ユーザーを許可
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +199,Operation is Mandatory,作業が必須です
-DocType: Purchase Order,Recurring,繰り返し発生します
+DocType: Purchase Order,Recurring,繰り返し
DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,製品の業種や部門ごとに個別の収益と費用を追跡します
DocType: Rename Tool,Rename Tool,ツール名称変更
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +11,Update Cost,費用更新
@@ -1909,7 +1909,7 @@
DocType: Installation Note,Installation Note,設置票
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,Add Taxes,税金を追加
,Financial Analytics,財務分析
-DocType: Quality Inspection,Verified By,によって証明／確認された。
+DocType: Quality Inspection,Verified By,検証者
DocType: Address,Subsidiary,子会社
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.","既存の取引が存在するため、会社のデフォルトの通貨を変更することができません。
デフォルトの通貨を変更するには取引をキャンセルする必要があります。"
@@ -1921,7 +1921,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金源泉（負債）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}（{1}）で製造量{2}と同じでなければなりません
DocType: Appraisal,Employee,従業員
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,からのインポートメール
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,メールインポート元
DocType: Features Setup,After Sale Installations,販売後設置
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1}は支払済です
DocType: Workstation Working Hour,End Time,終了時間
@@ -1961,7 +1961,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +45,Compensatory Off,代償オフ
DocType: Quality Inspection Reading,Accepted,承認済
DocType: User,Female,女性
-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.,あなたが本当にこの会社のすべてのトランザクションを削除することを確認してください。それがあるとして、あなたのマスタデータは残ります。このアクションは、元に戻すことはできません。
+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.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
DocType: Print Settings,Modern,モダン
DocType: Communication,Replied,返答
DocType: Payment Tool,Total Payment Amount,支払額合計
@@ -1973,24 +1973,24 @@
DocType: Employee,Previous Work Experience,前職歴
DocType: Stock Entry,For Quantity,数量
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1}は送信されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1}は提出されていません
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,アイテム要求
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
DocType: Email Digest,New Communications,新しい通信
-DocType: Purchase Invoice,Terms and Conditions1,利用規約１
+DocType: Purchase Invoice,Terms and Conditions1,規約１
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完全セットアップ
DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会計エントリーはこの日から凍結され、以下の役割を除いて実行／変更できません。
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +124,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
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),数に小数を許可しない場合チェック
-apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,ニュースレターのメーリングリスト
+apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,ニュースレターメーリングリスト
DocType: Delivery Note,Transporter Name,輸送者名
DocType: Contact,Enter department to which this Contact belongs,この連絡先の所属部署を入力してください
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,欠席合計
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,欠席計
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が材料要求と一致していません
apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,数量単位
DocType: Fiscal Year,Year End Date,年終日
-DocType: Task Depends On,Task Depends On,タスクが依存します
+DocType: Task Depends On,Task Depends On,依存するタスク
DocType: Lead,Opportunity,機会
DocType: Salary Structure Earning,Salary Structure Earning,給与体系（支給）
,Completed Production Orders,完成した製造指示
@@ -2047,7 +2047,7 @@
税率の異なる「アイテム（複数）」がある場合、アイテムマスタで「アイテムごとの税率」テーブルを追加しなければなりません。
＃＃＃＃表の説明
1. 計算タイプ：
-・「総計」（基本的な計の合計）
+・「差引計」（基本的な計の合計）
・「前行の計」（税・費用累計用）このオプションを選択した場合、税額は（税テーブルの）前行の率で適用されます。
・「実費」（前述の通り）
2. 科目：
@@ -2060,7 +2060,7 @@
税率
6. 額：
税額
-7. 合計：
+7. 計：
ここまでの累計額
8. 入力行：
「前行の計」に対して計算基準となる行数を選択することができます（デフォルトは「前行」です）
@@ -2071,10 +2071,10 @@
DocType: Note,Note,ノート
DocType: Email Digest,New Material Requests,新しい材料のリクエスト
DocType: Purchase Receipt Item,Recd Quantity,受領数量
-DocType: Email Account,Email Ids,電子メールID
+DocType: Email Account,Email Ids,メールアドレス
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,塞がれていないように設定します
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,ストックエントリ{0}は送信されません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,停止解除に設定
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,"この休暇申請は承認が保留されています。
休暇承認者だけがステータスを更新することができます。"
@@ -2108,7 +2108,7 @@
DocType: Backup Manager,Backup Right Now,今すぐバックアップ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,水道光熱費
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90以上
-DocType: Buying Settings,Default Buying Price List,デフォルトの購入価格表
+DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
DocType: Notification Control,Sales Order Message,受注メッセージ
apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",会社、通貨、会計年度などのデフォルト値を設定
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +20,Payment Type,支払タイプ
@@ -2132,7 +2132,7 @@
DocType: Account,Account Type,アカウントタイプ
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',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
,To Produce,製造
-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",行のため{0} {1}。 {2}項目のレートで、行は{3}も含まれている必要があります含めるには、
+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",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票（印刷用）
DocType: Bin,Reserved Quantity,予約数量
DocType: Landed Cost Voucher,Purchase Receipt Items,領収書アイテム
@@ -2153,7 +2153,7 @@
DocType: Notification Control,Purchase Order Message,発注メッセージ
DocType: Upload Attendance,Upload HTML,HTMLアップロード
apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Total advance ({0}) against Order {1} cannot be greater \
- than the Grand Total ({2})",注文{1}に対する前受金合計（{0}）は総計（{2}）より大きくすることはできません
+ than the Grand Total ({2})",注文{1}に対する前受金計（{0}）は総計（{2}）より大きくすることはできません
DocType: Employee,Relieving Date,退職日
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.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は在庫エントリー/納品書/領収書を介してのみ変更可能です
@@ -2166,35 +2166,35 @@
DocType: Item Supplier,Item Supplier,アイテムサプライヤー
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +331,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +679,Please select a value for {0} quotation_to {1},{1} {0} quotation_toの値を選択してください
-DocType: Global Defaults,For automatic exchange rates go to jsonrates.com and signup for an API key,自動為替レートjsonrates.comに移動し、APIキーのためにサインアップ
+DocType: Global Defaults,For automatic exchange rates go to jsonrates.com and signup for an API key,為替レートを自動化する場合は jsonrates.comに登録してAPIキーを取得してください
apps/erpnext/erpnext/config/selling.py +33,All Addresses.,全ての住所。
DocType: Company,Stock Settings,在庫設定
DocType: User,Bio,自己紹介
-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",次のプロパティが両方のレコードで同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
+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",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,顧客グループツリーを管理します。
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,新しいコストセンター名
DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
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.,デフォルトの住所テンプレートが見つかりませんでした。設定> 印刷とブランディング>住所テンプレートから新しく作成してください。
DocType: Appraisal,HR User,人事ユーザー
DocType: Purchase Invoice,Taxes and Charges Deducted,租税公課控除
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,問題
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,課題
apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},ステータスは{0}のどれかでなければなりません
DocType: Sales Invoice,Debit To,借方計上
DocType: Delivery Note,Required only for sample item.,サンプルアイテムにのみ必要です
DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,特大
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,XL
,Profit and Loss Statement,損益計算書
DocType: Bank Reconciliation Detail,Cheque Number,小切手番号
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Pressing,押します
DocType: Payment Tool Detail,Payment Tool Detail,支払ツールの詳細
,Sales Browser,販売ブラウザ
DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}は、株式のエントリに対して存在する{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,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,債務者
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +142,Large,大
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +142,Large,L
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +18,No employee found!,従業員が見つかりません！
DocType: C-Form Invoice Detail,Territory,地域
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +162,Please mention no of visits required,必要な訪問の数を記述してください
@@ -2202,7 +2202,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Polishing,研磨
DocType: Production Order Operation,Planned Start Time,計画開始時間
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,割り当て済み
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳する
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,別通貨に変換するための為替レートを指定
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row{0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：当事者タイプと当事者は売掛金／買掛金に対してのみ適用されます
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {0} is cancelled,見積{0}はキャンセルされました
@@ -2219,7 +2219,7 @@
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ルート（大元の）顧客グループなので編集できません
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,会計エントリーを開始する前に、勘定科目を設定してください
DocType: Purchase Invoice,Ignore Pricing Rule,価格設定ルールを無視
-sites/assets/js/list.min.js +23,Cancelled,キャンセル済み
+sites/assets/js/list.min.js +23,Cancelled,キャンセル
DocType: Employee Education,Graduate,大卒
DocType: Leave Block List,Block Days,ブロック日数
DocType: Journal Entry,Excise Entry,消費税エントリ
@@ -2254,7 +2254,7 @@
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
DocType: Packing Slip,If more than one package of the same type (for print),同じタイプで複数パッケージの場合（印刷用）
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,最大 {0} 行許容
-DocType: C-Form Invoice Detail,Net Total,合計額
+DocType: C-Form Invoice Detail,Net Total,差引計
DocType: Bin,FCFS Rate,FCFSレート
apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),請求書
DocType: Payment Reconciliation Invoice,Outstanding Amount,残高
@@ -2266,7 +2266,7 @@
DocType: BOM Item,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",料金は、選択によって、アイテムの数量または量に基づいて均等に分割されます
DocType: Maintenance Visit,Purposes,目的
-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",操作{0}のワークステーションで使用可能な任意の労働時間よりも長い{1}、複数の操作に操作を打破
+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",操作{0}は、ワークステーション{1}で使用可能な作業時間よりも長いため、複数の操作に分解してください
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electrochemical machining,電解加工
,Requested,要求済
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +62,No Remarks,備考がありません
@@ -2280,13 +2280,13 @@
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
DocType: Quotation,Rate at which customer's currency is converted to company's base currency,顧客の通貨が会社の基本通貨に換算されるレート
DocType: Purchase Invoice,Discount Amount (Company Currency),割引額（会社通貨）
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0}は、このリストから正常に解除しました。
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,このリストから{0}を正常に解除しました。
DocType: Purchase Invoice Item,Net Rate (Company Currency),ネットレート（会社通貨）
apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,地域ツリーを管理
DocType: Payment Reconciliation Payment,Sales Invoice,請求書
DocType: Journal Entry Account,Party Balance,当事者残高
DocType: Sales Invoice Item,Time Log Batch,時間ログバッチ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,ディスカウントでの適用]を選択してください
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,「割引を適用」を選択してください
DocType: Company,Default Receivable Account,デフォルト売掛金勘定
DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,上記選択条件に支払われる総給与のための銀行エントリを作成
DocType: Item,Item will be saved by this name in the data base.,アイテムは、データベースにこの名前で保存されます。
@@ -2301,16 +2301,16 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,アイテム{0}は存在しません
DocType: Item,"Selecting ""Yes"" will allow you to make a Production Order for this item.",「はい」を選択すると、このアイテムの製造指示を行うことができます。
DocType: Sales Invoice,Customer Address,顧客の住所
-DocType: Purchase Invoice,Total,合計
+DocType: Purchase Invoice,Total,計
DocType: Backup Manager,System for managing Backups,バックアップ管理システム
DocType: Account,Root Type,ルートタイプ
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,プロット
DocType: Item Group,Show this slideshow at the top of the page,ページの上部にこのスライドショーを表示
DocType: BOM,Item UOM,アイテム数量単位
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),割引額（会社通貨）後税額
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),割引後税額（会社通貨）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +165,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
DocType: Quality Inspection,Quality Inspection,品質検査
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Extra Small,エクストラ·スモール
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Extra Small,XS
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,溶射成形
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,警告：材料の注文数が注文最小数を下回っています。
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,アカウント{0}は凍結されています
@@ -2335,7 +2335,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +146,Colour,カラー
DocType: Maintenance Visit,Scheduled,スケジュール設定済
DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
-DocType: Purchase Invoice Item,Valuation Rate,評価率
+DocType: Purchase Invoice Item,Valuation Rate,評価額
DocType: Address,Check to make Shipping Address,配送先住所を確認してください
apps/erpnext/erpnext/stock/get_item_details.py +253,Price List Currency not selected,価格表の通貨が選択されていません
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,アイテムの行{0}：領収書{1}は上記の「領収書」テーブルに存在しません
@@ -2353,7 +2353,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +90,Researcher,リサーチャー
apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +87,Update,更新
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +75,Please save the Newsletter before sending,送信する前にニュースレターを保存してください
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,名前やメールは必須です
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,名前またはメールが必須です
apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,収入品質検査。
DocType: Employee,Exit,終了
apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Root Type is mandatory,ルートタイプが必須です
@@ -2367,16 +2367,16 @@
DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
DocType: Expense Claim,Expense Approver,経費承認者
DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
-sites/assets/js/erpnext.min.js +43,Pay,支払い
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,日時
+sites/assets/js/erpnext.min.js +43,Pay,支払
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,終了日時
DocType: SMS Settings,SMS Gateway URL,SMSゲートウェイURL
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Grinding,研削
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink wrapping,収縮包装
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink wrapping,シュリンクラップ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,サプライヤー>サプライヤータイプ
apps/erpnext/erpnext/hr/doctype/employee/employee.py +123,Please enter relieving date.,解任日を入力してください。
apps/erpnext/erpnext/controllers/trends.py +137,Amt,量／額
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +237,Serial No {0} status must be 'Available' to Deliver,配送するにはシリアル番号 {0}のステータスが「利用可能」でなければなりません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ送信可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,住所タイトルは必須です。
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,新聞社
@@ -2398,13 +2398,13 @@
DocType: Sales Order,In Words will be visible once you save the Sales Order.,受注を保存すると表示される表記内。
,Employee Birthday,従業員の誕生日
DocType: GL Entry,Debit Amt,借方額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Venture Capital,ベンチャーキャピタル(投資会社）
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Venture Capital,ベンチャーキャピタル
DocType: UOM,Must be Whole Number,整数でなければなりません
DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,シリアル番号 {0}は存在しません
DocType: Pricing Rule,Discount Percentage,割引率
DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
-apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,オーダー
+apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,注文
DocType: Leave Control Panel,Employee Type,従業員タイプ
DocType: Employee Leave Approver,Leave Approver,休暇承認者
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,スウェージング
@@ -2463,9 +2463,9 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +242,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
apps/erpnext/erpnext/config/selling.py +122,Tax template for selling transactions.,販売取引用の税のテンプレート
DocType: Sales Invoice,Write Off Outstanding Amount,未償却残額
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",自動で繰り返し請求にする場合チェックをオンにします。請求書の送信後、「繰り返し」セクションが表示されます。
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",自動で繰り返し請求にする場合チェックをオンにします。請求書の提出後、「繰り返し」セクションが表示されます。
DocType: Account,Accounts Manager,会計管理者
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',時間ログ{0}は「送信済」でなければなりません
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',時間ログ{0}は「提出済」でなければなりません
DocType: Stock Settings,Default Stock UOM,デフォルト在庫数量単位
DocType: Production Planning Tool,Create Material Requests,素材の要求を作成
DocType: Employee Education,School/University,学校/大学
@@ -2482,7 +2482,7 @@
DocType: Payment Tool,Against Vouchers,対伝票
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,クイックヘルプ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},出庫元／入庫先を同じ行{0}に入れることはできません
-DocType: Features Setup,Sales Extras,販売のおまけ、試供
+DocType: Features Setup,Sales Extras,試供
apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},コストセンター{2}に対するアカウント{1}の予算{0}が {3}により超えてしまいます
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
DocType: Leave Allocation,Carry Forwarded Leaves,繰り越し休暇
@@ -2492,7 +2492,7 @@
DocType: Warranty Claim,From Company,会社から
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,値または数量
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Minute,分
-DocType: Purchase Invoice,Purchase Taxes and Charges,仕入租税公課
+DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
DocType: Backup Manager,Upload Backups to Dropbox,DropBoxへバックアップ
,Qty to Receive,受領数
DocType: Leave Block List,Leave Block List Allowed,許可済休暇リスト
@@ -2511,7 +2511,7 @@
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,無視：
apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0}はショッピングカートを使って購入することはできません
apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,素晴らしい製品
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,バランスエクイティを開きます
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance 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,該当期間の休暇申請を承認する権限がありません
DocType: Appraisal,Appraisal,査定
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Lost-foam casting,ロストフォーム鋳造
@@ -2519,7 +2519,7 @@
apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日付が繰り返されます
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
DocType: Hub Settings,Seller Email,販売者のメール
-DocType: Project,Total Purchase Cost (via Purchase Invoice),総購入コスト（購入請求書を介して）
+DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
DocType: Workstation Working Hour,Start Time,開始時間
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +183,Select Quantity,数量を選択
DocType: Sales Taxes and Charges Template,"Specify a list of Territories, for which, this Taxes Master is valid",この税マスターが有効な領域のリストを指定
@@ -2532,13 +2532,13 @@
DocType: Stock Settings,Item Naming By,アイテム命名
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,見積から
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
-DocType: Production Order,Material Transferred for Manufacturing,製造業のために転写された材料
+DocType: Production Order,Material Transferred for Manufacturing,製造のために移設された材料
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,アカウント{0}が存在しません
DocType: Purchase Receipt Item,Purchase Order Item No,発注アイテム番号
DocType: System Settings,System Settings,システム設定
DocType: Project,Project Type,プロジェクトタイプ
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ターゲット数量や目標量のどちらかが必須です。
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,様々な活動のコスト
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,様々な活動の費用
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +93,Not allowed to update stock transactions older than {0},{0}よりも古い在庫取引を更新することはできません
DocType: Item,Inspection Required,要検査
DocType: Purchase Invoice Item,PR Detail,PR詳細
@@ -2547,7 +2547,7 @@
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: Serial No,Is Cancelled,キャンセル済
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,マイ出荷
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,自分の出荷
DocType: Journal Entry,Bill Date,ビル日
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:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
DocType: Supplier,Supplier Details,サプライヤー詳細
@@ -2568,10 +2568,10 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +189,Welcome to ERPNext,ERPNextへようこそ
DocType: Payment Reconciliation Payment,Voucher Detail Number,伝票詳細番号
DocType: Lead,From Customer,顧客から
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,通話
-DocType: Project,Total Costing Amount (via Time Logs),総原価額（タイムログを介して）
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,電話
+DocType: Project,Total Costing Amount (via Time Logs),総原価額（時間ログ経由）
DocType: Purchase Order Item Supplied,Stock UOM,在庫単位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,発注{0}は送信されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,発注{0}は提出されていません
apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1}はアイテム派生テーブルに複数回入力されています
,Projected,投影された
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
@@ -2592,7 +2592,7 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +43,Against Invoice Posting Date,対請求書転記日付
DocType: Purchase Receipt Item,Landed Cost Voucher Amount,陸揚費用伝票額
DocType: Time Log,Batched for Billing,請求の一括処理
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,サプライヤーが提起した請求書。
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,サプライヤーからの請求
DocType: POS Setting,Write Off Account,償却勘定
DocType: Purchase Invoice,Discount Amount,割引額
DocType: Item,Warranty Period (in days),保証期間（日数）
@@ -2619,12 +2619,12 @@
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,粗利益％
DocType: Appraisal Goal,Weightage (%),重み付け（％）
DocType: Bank Reconciliation Detail,Clearance Date,決済日
-DocType: Newsletter,Newsletter List,ニュースレター一覧
+DocType: Newsletter,Newsletter List,ニュースレターリスト
DocType: Salary Manager,Check if you want to send salary slip in mail to each employee while submitting salary slip,給与明細を登録する時に、各従業員へメールで給与明細を送信したい場合チェック
DocType: Lead,Address Desc,住所種別
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,販売または購入のいずれかを選択する必要があります
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",この在庫棚卸エントリはオープンされているため、差損益は「負債」タイプのアカウントである必要があります
-apps/erpnext/erpnext/stock/doctype/item/item.js +215,"Variants can not be created manually, add item attributes in the template item",変異体は、テンプレートの項目に項目属性を追加し、手動で作成することができません
+apps/erpnext/erpnext/stock/doctype/item/item.js +215,"Variants can not be created manually, add item attributes in the template item",「派生」は手動で作成することができません。テンプレートアイテムにアイテム属性を追加してください
apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,製造作業が行なわれる場所
DocType: Page,All,すべて
DocType: Stock Entry Detail,Source Warehouse,出庫元
@@ -2636,22 +2636,22 @@
apps/frappe/frappe/core/page/permission_manager/permission_manager.js +421,Set,設定
DocType: Item,Warehouse-wise Reorder Levels,倉庫ごとの再注文レベル
DocType: Lead,Lead Owner,リード所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +241,Warehouse is required,倉庫が必要とされます
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +241,Warehouse is required,倉庫が必要です
DocType: Employee,Marital Status,配偶者の有無
DocType: Stock Settings,Auto Material Request,自動材料要求
DocType: Time Log,Will be updated when billed.,記帳時に更新されます。
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,「現在の部品表」と「新しい部品表」は同じにすることはできません
apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
DocType: Sales Invoice,Against Income Account,対損益勘定
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}％配信
-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).,アイテム{0}：発注数量が、{1} {2}（項目に定義されている）最小注文数量より小さくすることはできません。
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}％配送済
+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).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
DocType: Territory,Territory Targets,ターゲット地域
DocType: Delivery Note,Transporter Info,輸送情報
DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,発注アイテム供給済
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.,印刷テンプレートのタイトル（例：「見積送り状」）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,評価タイプの料金はインクルーシブとしてマークされていないことができ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
DocType: POS Setting,Update Stock,在庫更新
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Superfinishing,超仕上げ
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.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
@@ -2689,7 +2689,7 @@
DocType: Account,Rate at which this tax is applied,この税金が適用されるレート
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,再注文数量
DocType: Company,Stock Adjustment Account,在庫調整勘定
-DocType: Sales Invoice,Write Off,帳消し
+DocType: Sales Invoice,Write Off,償却
DocType: Time Log,Operation ID,操作ID
DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",システムユーザー（ログイン）IDを指定します。設定すると、すべての人事フォームのデフォルトになります。
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：{1}から
@@ -2720,19 +2720,19 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{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.",注意：支払が任意の参照に対して行われていない場合は、手動で仕訳を作成します
DocType: Item,Supplier Items,サプライヤーアイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +165,Please enter atleast one attribute row in Item Variants table,項目バリアントテーブルに少なくとも1つの属性列を入力してください。
+apps/erpnext/erpnext/stock/doctype/item/item.py +165,Please enter atleast one attribute row in Item Variants table,アイテム派生テーブルに少なくとも1つの属性列を入力してください
DocType: Opportunity,Opportunity Type,機会タイプ
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,新しい会社
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +50,Cost Center is required for 'Profit and Loss' account {0},「損益」アカウント{0}にはコストセンターが必要です
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +16,Transactions can only be deleted by the creator of the Company,トランザクションは、当社の作成者によって削除することができます
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +16,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.,総勘定元帳のエントリの数が正しくありませんが見つかりました。取引に間違った勘定を選択している場合があります。
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,銀行口座を作成
DocType: Hub Settings,Publish Availability,公開可用性
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,生年月日が今日より大きくすることはできません。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
,Stock Ageing,在庫エイジング
-DocType: Purchase Receipt,Automatically updated from BOM table,自動的にBOMテーブルから更新
+DocType: Purchase Receipt,Automatically updated from BOM table,部品表テーブルから自動的に更新
apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}'は無効になっています
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンとして設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +282,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
Available Qty: {4}, Transfer Qty: {5}",行{0}：{2} {3} の倉庫 {1} で可能な数量ではありません（可能な数量 {4}／移転数量 {5}）
@@ -2745,15 +2745,15 @@
DocType: Sales Person,Sales Person Name,営業担当者名
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,表に少なくとも1件の請求書を入力してください
DocType: Pricing Rule,Item Group,アイテムグループ
-DocType: Task,Actual Start Date (via Time Logs),（タイムログを介して）実際の開始日
-DocType: Stock Reconciliation Item,Before reconciliation,和解前
+DocType: Task,Actual Start Date (via Time Logs),実際の開始日（時間ログ経由）
+DocType: Stock Reconciliation Item,Before reconciliation,照合前
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),租税公課が追加されました。（報告通貨）
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,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
DocType: Sales Order,Partly Billed,一部支払済
DocType: Item,Default 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,再入力会社名は確定してください。
+apps/erpnext/erpnext/setup/doctype/company/company.js +17,Please re-type company name to confirm,確認のため会社名を再入力してください
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
DocType: Time Log Batch,Total Hours,時間合計
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
@@ -2762,7 +2762,7 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,アイテムが必要です
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,金属射出成形
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,納品書から
-DocType: Time Log,From Time,時刻から
+DocType: Time Log,From Time,開始時間
DocType: Notification Control,Custom Message,カスタムメッセージ
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,投資銀行
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency",国、時間帯、通貨を選択
@@ -2772,11 +2772,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,酸洗い
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,砂型鋳造
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Electroplating,電気めっき
-DocType: Purchase Invoice Item,Rate,率／単価
+DocType: Purchase Invoice Item,Rate,単価／率
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Intern,インターン
DocType: Newsletter,A Lead with this email id should exist,このメールIDを持つリードが必要です
-DocType: Stock Entry,From BOM,BOMから
-DocType: Time Log,Billing Rate (per hour),課金レート（毎時）
+DocType: Stock Entry,From BOM,参照元部品表
+DocType: Time Log,Billing Rate (per hour),請求料率（毎時）
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +226,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
@@ -2792,12 +2792,12 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Airline,航空会社
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +511,Issue Material,課題材料
DocType: Material Request Item,For Warehouse,倉庫用
-DocType: Employee,Offer Date,申込日
+DocType: Employee,Offer Date,雇用契約日
DocType: Hub Settings,Access Token,アクセストークン
DocType: Sales Invoice Item,Serial No,シリアル番号
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please enter Maintaince Details first,メンテナンス詳細を入力してください
DocType: Item,Is Fixed Asset Item,固定資産アイテム
-DocType: Stock Entry,Including items for sub assemblies,サブアセンブリのための項目を含みます
+DocType: Stock Entry,Including items for sub assemblies,サブアセンブリのためのアイテムを含む
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",長いプリント形式を使用している場合、この機能は、各ページのすべてのヘッダーとフッターに複数のページに印刷されるページを分割するために使用することができます
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Hobbing,ホブ切り
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,全ての領域
@@ -2862,7 +2862,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,時
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +133,"Serialized Item {0} cannot be updated \
using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,サプライヤに材料を転送
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,サプライヤーに材料を配送
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,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
DocType: Lead,Lead Type,リードタイプ
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,見積を登録
@@ -2883,7 +2883,7 @@
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0}受信者
DocType: Features Setup,Item Groups in Details,アイテムグループ詳細
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,経費科目は必須です
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),スタートPOS（販売時点情報管理）
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),POSを開始
DocType: Item,A new variant (Item) will be created for each attribute value combination,新しい派生（アイテム）は、各属性値の組み合わせのために作成されます
apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,メンテナンス要請の訪問レポート。
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単位の受領を許可されます。
@@ -2928,7 +2928,7 @@
DocType: ToDo,Reference,リファレンス
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,穿孔
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,出量
-apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するためのルール
+apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,シリーズは必須です
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,金融サービス
DocType: Opportunity,Sales,販売
@@ -2941,7 +2941,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +567,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,焼結
-DocType: Journal Entry,Pay To / Recd From,から/ RECDに支払う
+DocType: Journal Entry,Pay To / Recd From,支払先／受領元
DocType: Naming Series,Setup Series,シリーズ設定
DocType: Supplier,Contact HTML,連絡先HTML
DocType: Landed Cost Voucher,Purchase Receipts,仕入領収書
@@ -2952,7 +2952,7 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,顧客{0}は存在しません
DocType: Attendance,Absent,欠勤
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Crushing,押しつぶします
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,税および充満テンプレートを購入
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
DocType: Upload Attendance,Download Template,テンプレートのダウンロード
DocType: GL Entry,Remarks,備考
DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料アイテムコード
@@ -2968,7 +2968,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +257,Region,地域
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Valuation Rate is not allowed,マイナスの評価レートは許可されていません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
DocType: Holiday List,Weekly Off,週休
DocType: Fiscal Year,"For e.g. 2012, 2012-13","例：2012, 2012-13"
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +13,Dropbox,Dropbox
@@ -2989,9 +2989,9 @@
DocType: Features Setup,Sales Discounts,販売割引
DocType: Hub Settings,Seller Country,販売者所在国
DocType: Authorization Rule,Authorization Rule,認証ルール
-DocType: Sales Invoice,Terms and Conditions Details,利用規約の詳細
+DocType: Sales Invoice,Terms and Conditions Details,規約の詳細
apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,仕様
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,売上税および充満テンプレート
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,販売租税公課テンプレート
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,服飾
DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.",在庫アイテムが「はい」の場合は必須です。またデフォルトの倉庫も、予約済みの数量が受注から設定されている場合は同様です。
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,注文数
@@ -3003,7 +3003,7 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,変換係数が必要です
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +32,Serial #,シリアル番号
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,販売手数料
-DocType: Offer Letter Term,Value / Description,値/説明
+DocType: Offer Letter Term,Value / Description,値／説明
,Customers Not Buying Since Long Time,長期間受注の無い顧客
DocType: Production Order,Expected Delivery Date,配送予定日
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Bulging,ふくらみ
@@ -3011,7 +3011,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,交際費
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +176,Sales Invoice {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、請求書{0}がキャンセルされていなければなりません
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +34,Age,年齢
-DocType: Time Log,Billing Amount,請求金額
+DocType: Time Log,Billing Amount,請求額
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以上でなければなりません。
apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,休暇申請
apps/erpnext/erpnext/accounts/doctype/account/account.py +144,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
@@ -3031,7 +3031,7 @@
DocType: Maintenance Visit,Breakdown,故障
DocType: Bank Reconciliation Detail,Cheque Date,小切手日
apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}：親アカウント{1}は会社{2}に属していません
-apps/erpnext/erpnext/setup/doctype/company/company.js +33,Successfully deleted all transactions related to this company!,正常にこの会社に関連するすべてのトランザクションを削除！
+apps/erpnext/erpnext/setup/doctype/company/company.js +33,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Honing,ホーニング仕上げ
DocType: Serial No,"Only Serial Nos with status ""Available"" can be delivered.",ステータスを「利用可能」としたシリアル番号のみ配送可能です。
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +53,Probation,試用
@@ -3044,7 +3044,7 @@
,Transferred Qty,移転数量
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Planning,計画
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,時間ログバッチを作成
-DocType: Project,Total Billing Amount (via Time Logs),合計請求金額（タイムログを介して）
+DocType: Project,Total Billing Amount (via Time Logs),総請求金額（時間ログ経由）
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +577,We sell this Item,このアイテムを売る
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Supplier Id,サプライヤーID
DocType: Journal Entry,Cash Entry,現金エントリー
@@ -3068,7 +3068,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Rotational molding,回転成形
apps/erpnext/erpnext/config/hr.py +115,Salary template master.,給与テンプレートマスター
DocType: Leave Type,Max Days Leave Allowed,休暇割当最大日数
-DocType: Payment Tool,Set Matching Amounts,設定が一致した金額
+DocType: Payment Tool,Set Matching Amounts,一致額を設定
DocType: Purchase Invoice,Taxes and Charges Added,租税公課が追加されました。
,Sales Funnel,セールスファネル
apps/erpnext/erpnext/shopping_cart/utils.py +34,Cart,カート
@@ -3079,9 +3079,9 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,全ての顧客グループ
apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,アカウント{0}：親アカウント{1}が存在しません
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表のレート（会社通貨）
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価（会社通貨）
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1}ステータスは「停止」です
-DocType: Account,Temporary,一時的な
+DocType: Account,Temporary,仮勘定
DocType: Address,Preferred Billing Address,優先請求先住所
DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,秘書
@@ -3090,11 +3090,11 @@
DocType: Pricing Rule,Buying,購入
DocType: HR Settings,Employee Records to be created by,従業員レコード作成元
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,この時間ログバッチはキャンセルされました
-DocType: Purchase Invoice,Apply Discount On,割引の適用について
+DocType: Purchase Invoice,Apply Discount On,割引の適用
DocType: Salary Slip Earning,Salary Slip Earning,給与支給明細
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,債権者
DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの税の詳細
-,Item-wise Price List Rate,アイテムごとの価格表レート
+,Item-wise Price List Rate,アイテムごとの価格表単価
DocType: Purchase Order Item,Supplier Quotation,サプライヤー見積
DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,アイロンがけ
@@ -3143,12 +3143,12 @@
apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,CSVファイルで出勤アップロード
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,未払額
DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,この営業担当者にアイテムグループごとの目標を設定する
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",この課題を割り当てるには、サイドバーの「割り当て」ボタンを使用します
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",この課題を割り当てるには、サイドバーの「割当」ボタンを使用します
DocType: Stock Settings,Freeze Stocks Older Than [Days],[日]より古い在庫を凍結
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.","上記の条件内に二つ以上の価格設定ルールがある場合、優先順位が適用されます。
優先度は0〜20の間の数で、デフォルト値はゼロ（空白）です。同じ条件で複数の価格設定ルールがある場合、大きい数字が優先されることになります。"
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,Against Invoice,対請求書
-apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,年度：{0}が存在しません
+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/config/hr.py +155,Types of Expense Claim.,経費請求タイプ
@@ -3194,35 +3194,35 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +10,To Bill,請求先
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Piecework,歩合
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均購入レート
-DocType: Task,Actual Time (in Hours),（営業時間内）実際の時間
+DocType: Task,Actual Time (in Hours),実際の時間（時）
DocType: Employee,History In Company,会社での履歴
DocType: Address,Shipping,出荷
DocType: Stock Ledger Entry,Stock Ledger Entry,在庫元帳エントリー
DocType: Department,Leave 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,アイテム{0}にはシリアル番号が設定されていません。列は空白でなければなりません。
-DocType: Accounts Settings,Accounts Settings,設定のアカウント
+DocType: Accounts Settings,Accounts Settings,アカウント設定
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,設備や機械
DocType: Item,You can enter the minimum quantity of this item to be ordered.,注文するアイテムの最小数量を入力できます
DocType: Sales Partner,Partner's Website,パートナーのウェブサイト
DocType: Opportunity,To Discuss,連絡事項
DocType: SMS Settings,SMS Settings,SMS設定
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,一時アカウント
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,仮勘定
DocType: Payment Tool,Column Break 1,列区切り1
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,黒
DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
DocType: Account,Auditor,監査人
DocType: Purchase Order,End date of current order's period,現在の注文の期間の終了日
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,オファーレターを作ります
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,雇用契約書を作成
DocType: DocField,Fold,フォールド
DocType: Production Order Operation,Production Order Operation,製造指示作業
DocType: Pricing Rule,Disable,無効にする
DocType: Project Task,Pending Review,レビュー待ち
sites/assets/js/desk.min.js +558,Please specify,指定してください
-DocType: Task,Total Expense Claim (via Expense Claim),（経費請求を介して）、総経費請求
+DocType: Task,Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）
apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +65,Customer Id,顧客ID
DocType: Page,Page Name,ページ名
DocType: Purchase Invoice,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,受注{0}は送信されませんでした
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,受注{0}は提出されていません
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：親口座{1}は会社{2}に属していません
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,スピンドル仕上げ
DocType: Material Request,% of materials ordered against this Material Request,この材料要求に対して受注した材料の％
@@ -3260,7 +3260,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},{0} {1}の現在のステータスは{2}です
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,残高数量
DocType: Item Group,Parent Item Group,親項目グループ
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} for {1}
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,コストセンター
apps/erpnext/erpnext/config/stock.py +115,Warehouses.,倉庫。
DocType: Purchase Order,Rate at which supplier's currency is converted to company's base currency,サプライヤの通貨が会社の基本通貨に換算されるレート
@@ -3284,7 +3284,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},アイテム{0}にはシリアル番号が必須です
sites/assets/js/desk.min.js +536,Created By,によって作成された
DocType: Serial No,Under AMC,AMC（年間保守契約）下
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,アイテムの評価率は陸揚げコストの伝票数を考慮して再計算されています
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,アイテムの評価額は陸揚費用の伝票額を考慮して再計算されています
apps/erpnext/erpnext/config/selling.py +65,Default settings for selling transactions.,販売取引のデフォルト設定
DocType: BOM Replace Tool,Current BOM,現在の部品表
sites/assets/js/erpnext.min.js +5,Add Serial No,シリアル番号を追加
@@ -3300,7 +3300,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
DocType: Company,Distribution,配布
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,プロジェクトマネージャー
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,ディスパッチ
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,発送
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引：{0}が{1}％
DocType: Account,Receivable,売掛金
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
@@ -3325,17 +3325,17 @@
DocType: Journal Entry,eg. Cheque Number,例「小切手番号」
apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +25,Company is missing in warehouses {0},倉庫{0}に「会社」がありません
DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,在庫単位置換ユーティリティ
-DocType: POS Setting,Terms and Conditions,利用規約
+DocType: POS Setting,Terms and Conditions,規約
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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 +156,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
-DocType: Purchase Invoice,In Words,表記内
+DocType: Purchase Invoice,In Words,文字表記
apps/erpnext/erpnext/hr/doctype/employee/employee.py +204,Today is {0}'s birthday!,今日は {0} の誕生日です！
DocType: Production Planning Tool,Material Request For Warehouse,倉庫への材料要求
DocType: Sales Order Item,For Production,生産用
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +107,Please enter sales order in the above table,上記の表に受注を入力してください
-DocType: Project Task,View Task,[タスク
+DocType: Project Task,View Task,タスク表示
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,会計年度開始日
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,領収書を入力してください
DocType: Sales Invoice,Get Advances Received,前受金を取得
@@ -3375,7 +3375,7 @@
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +39,System Balance,システム残高
DocType: Workflow,Is Active,アクティブ
apps/erpnext/erpnext/controllers/stock_controller.py +70,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,最初の文書を保存します。
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,先に文書を保存してください
DocType: Account,Chargeable,請求可能
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Linishing,Linishing
DocType: Company,Change Abbreviation,略語を変更
@@ -3386,7 +3386,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Blasting,爆破
DocType: Company,Warn,警告する
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +82,Item valuation updated,アイテムの評価を更新しました
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",他の発言、レコードに行く必要があり、注目に値する努力。
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
DocType: BOM,Manufacturing User,製造ユーザー
DocType: Purchase Order,Raw Materials Supplied,原材料供給
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}),製造または再梱包アイテムの総評価額（{0}）は原材料の合計評価額（{1}）より小さくすることはできません
@@ -3400,7 +3400,7 @@
DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,メンテナンス訪問目的
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期間
,General Ledger,総勘定元帳
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ビューリード
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,リードを表示
DocType: Item Attribute Value,Attribute Value,属性値
apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",メールIDは重複できませんが、すでに{0}に存在しています
,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
@@ -3444,7 +3444,7 @@
DocType: Item Customer Detail,Ref Code,参照コード
apps/erpnext/erpnext/config/hr.py +13,Employee records.,従業員レコード
DocType: HR Settings,Payroll Settings,給与計算の設定
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,リンクされていない請求書と支払いに照合。
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
DocType: Email Digest,New Purchase Orders,新しい発注
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Root cannot have a parent cost center,ルートには親コストセンターを指定できません
DocType: Sales Invoice,C-Form Applicable,C-フォーム適用
@@ -3456,8 +3456,8 @@
DocType: Appraisal,Start Date,開始日
sites/assets/js/desk.min.js +512,Value,値
apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,期間に休暇を割り当てる。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割り当てることはできません
-DocType: Purchase Invoice Item,Price List Rate,価格表のレート
+apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割当することはできません
+DocType: Purchase Invoice Item,Price List Rate,価格表単価
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,納品済のシリアル番号{0}を削除することはできません
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",この倉庫での利用可能な在庫に基づいて「在庫あり」または「在庫切れ」を表示します
apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),部品表（BOM）
@@ -3481,7 +3481,7 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +66,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Electron beam machining,電子ビーム加工
DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,製造指示{0}を送信しなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +160,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
apps/erpnext/erpnext/config/stock.py +141,Main Reports,メインレポート
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +73,Stock Ledger entries balances updated,在庫元帳エントリ残高を更新しました
@@ -3490,8 +3490,8 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,価格の追加/編集
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,コストセンターの表
,Requested Items To Be Ordered,発注予定の要求アイテム
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,マイオーダー
-DocType: Price List,Price List Name,価格リスト名
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,自分の注文
+DocType: Price List,Price List Name,価格表名称
DocType: Time Log,For Manufacturing,製造業向け
DocType: BOM,Manufacturing,製造
,Ordered Items To Be Delivered,納品予定の注文済アイテム
@@ -3500,9 +3500,9 @@
DocType: Industry Type,Industry Type,業種タイプ
apps/erpnext/erpnext/templates/includes/cart.js +264,Something went wrong!,問題発生！
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,請求書{0}は送信済です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完了日
-DocType: Purchase Invoice Item,Amount (Company Currency),金額（会社通貨）
+DocType: Purchase Invoice Item,Amount (Company Currency),額（会社通貨）
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,ダイカスト
DocType: Email Alert,Reference Date,参照日
apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,組織単位（部門）マスター。
@@ -3514,7 +3514,7 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +36,Stock UOM updated for Item {0},アイテム{0}の在庫数量単位を更新しました
DocType: Company History,Year,年
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +69,Please Update SMS Settings,SMSの設定を更新してください
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +34,Time Log {0} already billed,既に請求時のログ{0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +34,Time Log {0} already billed,時間ログ{0}は請求済です
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,無担保ローン
DocType: Cost Center,Cost Center Name,コストセンター名
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,シリアル番号{1}のアイテム{0}はすでに設置されています
@@ -3559,11 +3559,11 @@
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
DocType: Purchase Taxes and Charges,Account Head,勘定科目
-DocType: Price List,"Specify a list of Territories, for which, this Price List is valid",この価格表が有効な領域のリストを指定
+DocType: Price List,"Specify a list of Territories, for which, this Price List is valid",この価格表が有効な地域リストを指定
apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +106,Electrical,電気
DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計（出 - 入）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',目的のために必須の差異勘定 '{0}'
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',目的 '{0}' には差異勘定が必須です
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Peening,ピーニング
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,保証請求元
@@ -3578,10 +3578,10 @@
DocType: User,Enabled,有効
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,在庫資産
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},{0}年{1}の月のすべての給与伝票を登録しますか？
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,インポートサブスクライバ
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,登録者インポート
DocType: Target Detail,Target Qty,ターゲット数量
DocType: Attendance,Present,出勤
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,納品書{0}は送信してはいけません
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,納品書{0}は提出済にすることはできません
DocType: Notification Control,Sales Invoice Message,請求書メッセージ
DocType: Email Digest,Income Booked,記帳済収入
DocType: Authorization Rule,Based On,参照元
@@ -3598,13 +3598,13 @@
apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +55,Please set {0},{0}を設定してください
DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
DocType: Employee,Health Details,健康の詳細
-DocType: Offer Letter,Offer Letter Terms,オファーレター利用規約
+DocType: Offer Letter,Offer Letter Terms,雇用契約書条件
DocType: Features Setup,To track any installation or commissioning related work after sales,販売後の設置や試運転に関連する業務を記録する
-DocType: Project,Estimated Costing,推定原価計算
+DocType: Project,Estimated Costing,見積原価計算
DocType: Purchase Invoice Advance,Journal Entry Detail No,仕訳詳細番号
DocType: Employee External Work History,Salary,給与
DocType: Serial No,Delivery Document Type,納品文書タイプ
-DocType: Salary Manager,Submit all salary slips for the above selected criteria,上で選択した条件で全ての給与伝票を送信
+DocType: Salary Manager,Submit all salary slips for the above selected criteria,上で選択した条件で全ての給与伝票を提出
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} アイテム同期
DocType: Sales Order,Partly Delivered,一部納品済
DocType: Sales Invoice,Existing Customer,既存の顧客
@@ -3625,9 +3625,9 @@
取引にシリーズが設定されかつシリアル番号が記載されていない場合、自動シリアル番号は、このシリーズに基づいて作成されます。
このアイテムのシリアル番号を常に明示的に記載したい場合、これを空白のままにします。"
DocType: Upload Attendance,Upload Attendance,出勤アップロード
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,BOMと生産数量が要求されます
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ２
-DocType: Journal Entry Account,Amount,量／額
+DocType: Journal Entry Account,Amount,額
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Riveting,リベット打ち
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
,Sales Analytics,販売分析
@@ -3640,7 +3640,7 @@
DocType: Selling Settings,Settings for Selling Module,販売モジュール設定
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +68,Customer Service,顧客サービス
DocType: Item Customer Detail,Item Customer Detail,アイテム顧客詳細
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,候補者に仕事を提供しています。
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,雇用候補者
DocType: Notification Control,Prompt for Email on Submission of,の提出上の電子メールのプロンプト
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,アイテム{0}は在庫アイテムでなければなりません
apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,会計処理のデフォルト設定。
@@ -3662,7 +3662,7 @@
DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
DocType: Purchase Invoice,Against Expense Account,対経費
DocType: Production Order,Production Order,製造指示
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +242,Installation Note {0} has already been submitted,設置票{0}はすでに送信されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +242,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
DocType: Quotation Item,Against Docname,文書名に対して
DocType: SMS Center,All Employee (Active),全ての従業員（アクティブ）
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,"表示
@@ -3701,7 +3701,7 @@
apps/erpnext/erpnext/config/stock.py +125,Price List master.,価格表マスター
DocType: Task,Review Date,レビュー日
DocType: DocPerm,Level,レベル
-DocType: Purchase Taxes and Charges,On Net Total,合計額
+DocType: Purchase Taxes and Charges,On Net Total,差引計
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,支払ツールを使用する権限がありません
apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,％sの繰り返しに「通知メールアドレス」が指定されていません
@@ -3728,7 +3728,7 @@
DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
DocType: Item,Default Warehouse,デフォルト倉庫
-DocType: Task,Actual End Date (via Time Logs),（タイムログを介して）実際の終了日
+DocType: Task,Actual End Date (via Time Logs),実際の終了日（時間ログ経由）
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,親コストセンターを入力してください
DocType: Delivery Note,Print Without Amount,金額なしで印刷
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,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
@@ -3737,10 +3737,10 @@
DocType: Event,All Day,一日中
DocType: Communication,Support Team,サポートチーム
DocType: Appraisal,Total Score (Out of 5),総得点（5点満点）
-DocType: Contact Us Settings,State,都道府県
+DocType: Contact Us Settings,State,状態
DocType: Batch,Batch,バッチ
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,残高
-DocType: Project,Total Expense Claim (via Expense Claims),（経費請求を介して）、総経費請求
+DocType: Project,Total Expense Claim (via Expense Claims),総経費請求（経費請求経由）
DocType: User,Gender,性別
DocType: Journal Entry,Debit Note,借方票
DocType: Stock Entry,As per Stock UOM,在庫の数量単位ごと
@@ -3755,7 +3755,7 @@
DocType: Email Digest,Income Year to Date,年度収入
apps/erpnext/erpnext/config/setup.py +58,Create rules to restrict transactions based on values.,値に基づいて取引を制限するルールを作成
DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",チェックした場合、営業日数は全て祝日を含みますが、これにより1日あたりの給与の値は小さくなります
-DocType: Purchase Invoice,Total Advance,前払金合計
+DocType: Purchase Invoice,Total Advance,前払金計
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +543,Unstop Material Request,材料要求停止解除
DocType: Workflow State,User,ユーザー
DocType: Opportunity Item,Basic Rate,基本料金
@@ -3764,7 +3764,7 @@
DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,販売サイクル全体で同じレートを維持
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},アイテム{1}は{0}以上のものを返却することができません
DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ワークステーションの労働時間外のタイムログを計画します。
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1}は送信済です
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1}は提出済です
,Items To Be Requested,要求されるアイテム
DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
DocType: Company,Company Info,会社情報
@@ -3791,7 +3791,7 @@
DocType: DocField,Default,初期値
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",「はい」を選択すると、このアイテムは発注、仕入時の領収書に表示することができます。
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0}はユーザを追加しました
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0}登録者追加済
DocType: Maintenance Schedule,Schedule,スケジュール
DocType: Account,Parent Account,親勘定
DocType: Serial No,Available,利用可
@@ -3805,11 +3805,11 @@
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
DocType: Employee,Education,教育
DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
-DocType: Employee,Current Address Is,現在のアドレスは
+DocType: Employee,Current Address Is,現住所は：
DocType: Address,Office,事務所
apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準レポート
apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会計仕訳
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,最初の従業員レコードを選択してください。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,先に従業員レコードを選択してください
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,税勘定を作成
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +227,Please enter Expense Account,経費勘定を入力してください
DocType: Account,Stock,在庫
@@ -3830,12 +3830,12 @@
DocType: Production Plan Item,Planned Qty,計画数量
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +92,Total Tax,税合計
DocType: Stock Entry,Default Target Warehouse,デフォルト入庫先倉庫
-DocType: Purchase Invoice,Net Total (Company Currency),合計額（会社通貨）
+DocType: Purchase Invoice,Net Total (Company Currency),差引計（会社通貨）
DocType: Notification Control,Purchase Receipt Message,領収書のメッセージ
DocType: Production Order,Actual Start Date,実際の開始日
DocType: Sales Order,% of materials delivered against this Sales Order,％の材料が納品済（この受注を対象）
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,レコードアイテムの移動
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,ニュースレターリスト加入者
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,ニュースレターリスト購読者
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Morticing
DocType: Email Account,Service,サービス
DocType: Hub Settings,Hub Settings,ハブの設定
@@ -3853,8 +3853,8 @@
apps/erpnext/erpnext/config/accounts.py +143,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +190,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：支払金額は残高を超えることはできません
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,時間ログは請求できません
-apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants",{0}アイテムがテンプレートである、その変異体のいずれかを選択してください
-DocType: System Settings,Localization,現地語化
+apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。派生のいずれかを選択してください
+DocType: System Settings,Localization,ローカライズ
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +74,Net pay cannot be negative,給与をマイナスにすることはできません
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +70,Please enter the Against Vouchers manually,伝票を入力してください
DocType: SMS Settings,Static Parameters,静的パラメータ
@@ -3890,11 +3890,11 @@
apps/erpnext/erpnext/accounts/utils.py +188,Allocated amount can not greater than unadusted amount,割当額を未調整額より多くすることはできません
DocType: Manufacturing Settings,Allow Production on Holidays,休日に製造を許可
DocType: Sales Order,Customer's Purchase Order Date,顧客の発注日
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,資本ストック
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,株式資本
DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,csvファイルを選択してください
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Designer,デザイナー
-apps/erpnext/erpnext/config/selling.py +116,Terms and Conditions Template,利用規約のテンプレート
+apps/erpnext/erpnext/config/selling.py +116,Terms and Conditions Template,規約のテンプレート
DocType: Serial No,Delivery Details,納品詳細
DocType: Party Type,Allow Children,子を許可
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +362,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 9f66feb..bfd0c99 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -53,7 +53,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +235,Do really want to unstop production order:,खरोखर उत्पादन ऑर्डर बूच करू इच्छिता:
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,नवी रजेचा अर्ज
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,बँक ड्राफ्ट
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. ग्राहक शहाणा आयटम कोड ठेवणे, त्यांचा कोड वापर हा पर्याय आधारित ते शोध करण्यासाठी"
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. या पर्याय चा वापर ग्राहक नुसार आयटम कोड ठेवणे आणि आयटम कोड चा शोध करण्यासाठी करावा
DocType: Mode of Payment Account,Mode of Payment Account,भरणा खाते मोड
apps/erpnext/erpnext/stock/doctype/item/item.js +60,Show Variants,दर्शवा रूपे
DocType: Sales Invoice Item,Quantity,प्रमाण
@@ -379,7 +379,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,पुढे जाण्यासाठी कोणतीही खरेदी पावती प्रविष्ट करा
DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
DocType: Workstation,Consumable Cost,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका असणे आवश्यक आहे 'रजा मंजुरी'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,तोट्याचा कारण
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,नळी मण्यांचे काम
@@ -401,7 +401,7 @@
DocType: Account,Is Group,आहे गट
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Thermoforming
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Slitting
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','केस क्रमांक' 'प्रकरण क्रमांक पासून' पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','प्रकरण क्रमांक' पेक्षा 'प्रकरण क्रमांक पासून' कमी असू शकत नाही
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,ना नफा
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,प्रारंभ नाही
DocType: Lead,Channel Partner,चॅनेल पार्टनर
@@ -548,7 +548,7 @@
DocType: Employee,Reason for Resignation,राजीनामा कारण
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,कामगिरी मूल्यमापने साचा.
DocType: Payment Reconciliation,Invoice/Journal Entry Details,चलन / जर्नल प्रवेश तपशील
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' नाही आथिर्क वर्षात {2}
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' आथिर्क वर्षात नाही {2}
DocType: Buying Settings,Settings for Buying Module,विभाग खरेदी साठी सेटिंग्ज
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,पहिल्या खरेदी पावती प्रविष्ट करा
DocType: Buying Settings,Supplier Naming By,करून पुरवठादार नामांकन
@@ -1593,7 +1593,7 @@
DocType: Communication,Date,तारीख
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,पुन्हा करा ग्राहक महसूल
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.,"तुमची प्रणाली सेटअप केले जात आहे, तर खिळून बसा,. या काही क्षण लागू शकतात."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका 'एक्सपेन्स मंजुरी' असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'एक्सपेन्स मंजुरी' भूमिका असणे आवश्यक आहे
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,जोडी
DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
@@ -2421,7 +2421,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,बूच
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्ज
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,दुर्लक्ष केले:
-apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} हे खरेदी सूचीत टाका खरेदी वापर केला जाऊ शकत नाही
+apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} शॉपिंग कार्ट चा वापर करून खरेदी करू शकत नाही
apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,अप्रतिम उत्पादने
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance 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,तुम्ही ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही रजा मंजूर करू शकत नाही
@@ -2895,7 +2895,7 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,तारीख करण्यासाठी तारीख आणि विधान परिषदेच्या पासून उपस्थिती अनिवार्य आहे
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,होय किंवा नाही म्हणून 'Subcontracted आहे' प्रविष्ट करा
DocType: Sales Team,Contact No.,संपर्क क्रमांक
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,प्रवेश उघडत परवानगी नाही 'नफा व तोटा' प्रकार खाते {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही
DocType: Workflow State,Time,वेळ
DocType: Features Setup,Sales Discounts,विक्री सवलत
DocType: Hub Settings,Seller Country,विक्रेता देश
@@ -3258,7 +3258,7 @@
DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Burnishing
DocType: Features Setup,To enable <b>Point of Sale</b> view,<b>विक्री दृष्टिकोनातून</b> सक्षम करण्यासाठी
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'तारीख करण्यासाठी' आवश्यक आहे
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'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.","संकुल वितरित करण्यासाठी स्लिप पॅकिंग व्युत्पन्न. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
DocType: Sales Invoice Item,Sales Order Item,विक्री ऑर्डर आयटम
DocType: Salary Slip,Payment Days,भरणा दिवस
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index c1eb00a..f584353 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -1037,7 +1037,7 @@
DocType: DocField,Label,Label
DocType: Payment Reconciliation,Unreconciled Payment Details,Niet-afgeletterde Betalingsgegevens
DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
-DocType: Global Defaults,Disable Rounded Total,Uitschakelen Afgerond Totaal
+DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
DocType: Lead,Call,Bellen
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
@@ -1660,7 +1660,7 @@
DocType: Landed Cost Voucher,Distribute Charges Based On,Verdeel Toeslagen op basis van
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,"Rekening {0} moet van het type 'vaste activa', omdat Artikel {1} een Activa Artikel is"
DocType: HR Settings,HR Settings,HR-instellingen
-apps/frappe/frappe/config/setup.py +130,Printing,Het drukken
+apps/frappe/frappe/config/setup.py +130,Printing,Afdrukken
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
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.,De dag(en) waarvoor je verlof aanvraagt zijn feestdagen. Hier hoef je niet voor aan te vragen.
sites/assets/js/desk.min.js +684,and,en
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 4bf51d8..9cfb7a9 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -22,7 +22,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Compaction plus sintering,Zagęszczania oraz spiekania
DocType: Sales BOM,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""",
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,
@@ -86,7 +86,7 @@
apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nowy {0}: # {1}
,Sales Partners Commission,
apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
-DocType: Backup Manager,Allow Google Drive Access,
+DocType: Backup Manager,Allow Google Drive Access,Pozwól na dostęp do Google Drive
DocType: Email Digest,Projects & System,
DocType: Print Settings,Classic,Klasyczny
apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,
@@ -102,7 +102,7 @@
DocType: Employee,Married,
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Stock cannot be updated against Delivery Note {0},
DocType: Payment Reconciliation,Reconcile,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,Grocery,
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,Grocery,Artykuły spożywcze
DocType: Quality Inspection Reading,Reading 1,Odczyt 1
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +93,Make Bank Entry,Dodać Banku Entry
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Pension Funds,
@@ -159,11 +159,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Roczne Wynagrodzenie
DocType: Period Closing Voucher,Closing Fiscal Year,
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Wydatki na składowanie
-DocType: Newsletter,Email Sent?,
+DocType: Newsletter,Email Sent?,Wiadomość wysłana?
DocType: Journal Entry,Contra Entry,Contra Wejście
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,Show Time Logi
DocType: Email Digest,Bank/Cash Balance,
-DocType: Delivery Note,Installation Status,
+DocType: Delivery Note,Installation Status,Status instalacji
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
DocType: Item,Supply Raw Materials for Purchase,Dostawa surowce Skupu
apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,
@@ -184,7 +184,7 @@
DocType: Leave Application,Reason,
DocType: Purchase Invoice,The rate at which Bill Currency is converted into company's base currency,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Broadcasting,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +135,Execution,
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +135,Execution,Wykonanie
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,The first user will become the System Manager (you can change this later).,Pierwszy użytkownik będzie Administratorem Systemu (można to zmienić później).
apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Szczegóły dotyczące przeprowadzanych operacji.
DocType: Serial No,Maintenance Status,
@@ -207,7 +207,7 @@
DocType: Purchase Taxes and Charges,Valuation,
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,
,Purchase Order Trends,
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Przydziel zwolnienia dla roku.
DocType: Earning Type,Earning Type,
DocType: Email Digest,New Sales Orders,
DocType: Bank Reconciliation,Bank Account,Konto bankowe
@@ -282,7 +282,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Proszę wprowadzić grupę konto rodzica magazynowy {0}
DocType: Supplier,Address HTML,Adres HTML
DocType: Lead,Mobile No.,Nr tel. Komórkowego
-DocType: Maintenance Schedule,Generate Schedule,
+DocType: Maintenance Schedule,Generate Schedule,Utwórz Harmonogram
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Hubbing,Zagłębianie
DocType: Purchase Invoice Item,Expense Head,
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,
@@ -313,31 +313,31 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Necking,Przewężenie
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +29,Item is updated,
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +26,Global POS Setting {0} already created for company {1},
+apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +26,Global POS Setting {0} already created for company {1},Globalne ustawienia Point of Sale {0} zostały już utworzone dla firmy {1}
DocType: Comment,System Manager,System Manager
DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
DocType: Sales Invoice Item,Delivery Note,Dowód dostawy
-DocType: Backup Manager,Allow Dropbox Access,
+DocType: Backup Manager,Allow Dropbox Access,Pozwól na dostęp do Dropboksa
DocType: Communication,Support Manager,Support Manager
DocType: Sales Order Item,Reserved Warehouse,
apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,Payment Entry has been modified after you pulled it. Please pull it again.
apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,
DocType: Workstation,Rent Cost,
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Wpisz Email ID oddzielone przecinkami, faktura zostanie wysłana automatycznie określonego dnia"
DocType: Employee,Company Email,Email do firmy
DocType: Workflow State,Refresh,Odśwież
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.",
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,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +59,Total Order Considered,Zamówienie razem Uważany
DocType: Sales Invoice Item,Discount (%),Rabat (%)
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
apps/erpnext/erpnext/controllers/recurring_document.py +198,Please enter 'Repeat on Day of Month' field value,
DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,
DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",
DocType: Item Tax,Tax Rate,Stawka podatku
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Wybierz produkt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0}{1} stan jest Zastopowany
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
Stock Reconciliation, instead use Stock Entry","Pozycja: {0} udało partiami, nie da się pogodzić z wykorzystaniem \
Zdjęcie Pojednania, zamiast używać Stock Entry"
@@ -438,7 +438,7 @@
DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między operacjami (w min)
DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.",
DocType: Customer,Buyer of Goods and Services.,Nabywca towarów i usług.
-DocType: Journal Entry,Accounts Payable,
+DocType: Journal Entry,Accounts Payable,Zobowiązania
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj abonentów
sites/assets/js/erpnext.min.js +2,""" does not exists",""" nie istnieje"
DocType: Pricing Rule,Valid Upto,
@@ -457,11 +457,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Cosmetics,
DocType: DocField,Type,Typ
apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To merge, following properties must be same for both items",
-DocType: Backup Manager,Email ids separated by commas.,
+DocType: Backup Manager,Email ids separated by commas.,Email ID oddzielone przecinkami.
DocType: Communication,Subject,Temat
DocType: Item,"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Wybierz “Tak” jeśli produkt to jakaś forma usługi/pracy, np. szkolenie, doradztwo"
DocType: Shipping Rule,Net Weight,Waga netto
-DocType: Employee,Emergency Phone,
+DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
DocType: Backup Manager,Google Drive Access Allowed,
,Serial No Warranty Expiry,
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +634,Do you really want to STOP this Material Request?,
@@ -476,7 +476,7 @@
DocType: Selling Settings,Default Customer Group,Domyślna grupa klientów
DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",
DocType: BOM,Operating Cost,
-,Gross Profit,
+,Gross Profit,Zysk brutto
DocType: Production Planning Tool,Material Requirement,
DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,
@@ -491,7 +491,7 @@
DocType: Installation Note Item,Installation Note Item,
DocType: Job Applicant,Thread HTML,
DocType: Company,Ignore,Ignoruj
-DocType: Backup Manager,Enter Verification Code,
+DocType: Backup Manager,Enter Verification Code,Wpisz kod potwierdzenia
apps/erpnext/erpnext/controllers/buying_controller.py +136,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
DocType: Pricing Rule,Valid From,
DocType: Sales Invoice,Total Commission,
@@ -510,7 +510,7 @@
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,
DocType: Project Task,Project Task,Zadanie projektu
,Lead Id,
-DocType: C-Form Invoice Detail,Grand Total,
+DocType: C-Form Invoice Detail,Grand Total,Całkowita suma
DocType: About Us Settings,Website Manager,Manager WWW
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Data rozpoczęcia roku obrotowego nie powinny być większe niż data zakończenia roku obrotowego
DocType: Warranty Claim,Resolution,
@@ -518,7 +518,7 @@
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +67,Payable Account,Płatne konto
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Stałych klientów
DocType: Backup Manager,Sync with Google Drive,
-DocType: Leave Control Panel,Allocate,
+DocType: Leave Control Panel,Allocate,Przydziel
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Wstecz
DocType: Stock Entry,Sales Return,Zwrot sprzedaży
DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,
@@ -528,7 +528,7 @@
DocType: Quotation,Quotation To,Wycena dla
DocType: Lead,Middle Income,
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),
-apps/erpnext/erpnext/accounts/utils.py +186,Allocated amount can not be negative,
+apps/erpnext/erpnext/accounts/utils.py +186,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Tumbling,Koziołkujący
DocType: Purchase Order Item,Billed Amt,
DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
@@ -588,7 +588,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Posting timestamp must be after {0},
apps/frappe/frappe/config/setup.py +59,Settings,
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Koszt wylądowali podatki i opłaty
-DocType: Production Order Operation,Actual Start Time,Czas rozpoczęcia faktycznej
+DocType: Production Order Operation,Actual Start Time,Rzeczywisty Czas Rozpoczęcia
DocType: BOM Operation,Operation Time,Czas pracy
sites/assets/js/list.min.js +5,More,
DocType: Communication,Sales Manager,Menadżer Sprzedaży
@@ -788,7 +788,7 @@
DocType: Purchase Taxes and Charges,On Previous Row Total,
DocType: Salary Slip,Working Days,Dni robocze
DocType: Serial No,Incoming Rate,
-DocType: Packing Slip,Gross Weight,
+DocType: Packing Slip,Gross Weight,Waga brutto
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +409,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
DocType: HR Settings,Include holidays in Total no. of Working Days,
DocType: Job Applicant,Hold,
@@ -820,7 +820,7 @@
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikowanie synchronizować elementy
DocType: Purchase Receipt,Range,Przedział
DocType: Supplier,Default Payable Accounts,Domyślne Accounts Payable
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
DocType: Features Setup,Item Barcode,Kod kreskowy produktu
apps/erpnext/erpnext/stock/doctype/item/item.py +193,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
DocType: Quality Inspection Reading,Reading 6,Odczyt 6
@@ -856,7 +856,7 @@
DocType: Pricing Rule,Max Qty,Maks. Ilość
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
DocType: Salary Manager,Select Payroll Year and Month,Wybierz Płace rok i miesią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""",Idź do odpowiedniej grupy (zwykle wykorzystania funduszy> Aktywa obrotowe> rachunków bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu "Bank"
DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
@@ -868,7 +868,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +472,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,White,Biały
DocType: SMS Center,All Lead (Open),
-DocType: Purchase Invoice,Get Advances Paid,
+DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Picture,Załącz własny obrazek (awatar)
DocType: Journal Entry,Total Amount in Words,
DocType: Workflow State,Stop,zatrzymać
@@ -892,7 +892,7 @@
DocType: POS Setting,Cash/Bank Account,Konto Kasa/Bank
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
DocType: Delivery Note,Delivery To,Dostawa do
-DocType: Production Planning Tool,Get Sales Orders,
+DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nie może być ujemna
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,"Row {0}: Party / Account does not match with \
Customer / Debit To in {1}","Wiersz {0}: Strona / konto nie pasuje \
@@ -949,7 +949,7 @@
DocType: Shipping Rule Condition,Shipping Rule Condition,
DocType: Features Setup,Miscelleneous,
DocType: Holiday List,Get Weekly Off Dates,
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
DocType: Sales Person,Select company name first.,
DocType: Sales BOM Item,Sales BOM Item,
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Dr,Dr
@@ -959,11 +959,11 @@
apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Do {0} | {1} {2}
DocType: Time Log Batch,updated via Time Logs,aktualizowana przez Time Logs
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,
-apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,Śmiało i dodać coś do koszyka.
+apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,"Śmiało, dodaj coś do koszyka."
DocType: Opportunity,Your sales person who will contact the customer in future,
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +537,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
DocType: Supplier,Default Currency,Domyślna waluta
-DocType: Contact,Enter designation of this Contact,
+DocType: Contact,Enter designation of this Contact,Wpisz stanowisko tego Kontaktu
DocType: Contact Us Settings,Address,Adres
DocType: Expense Claim,From Employee,
apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} nie w każdym roku podatkowym. Więcej szczegółów sprawdzić {2}.
@@ -972,7 +972,7 @@
DocType: Upload Attendance,Attendance From Date,
DocType: Appraisal Template Goal,Key Performance Area,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} musi zostać dodane
DocType: SMS Center,Total Characters,Wszystkich Postacie
apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
DocType: C-Form Invoice Detail,C-Form Invoice Detail,
@@ -987,7 +987,7 @@
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +53,Budget cannot be set for Group Cost Centers,
,Ordered Items To Be Billed,
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,
-DocType: Global Defaults,Global Defaults,
+DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
DocType: Salary Slip,Deductions,
DocType: Purchase Invoice,Start date of current invoice's period,
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,
@@ -1003,19 +1003,19 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,
apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Odlewania
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +45,Either debit or credit amount is required for {0},
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +45,Either debit or credit amount is required for {0},Kwota po stronie winien lub ma jest wymagana dla {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 będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,
apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktywny
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Niebieski
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,
DocType: Item,UOMs,Jednostki miary (UOM)
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,
DocType: Purchase Order Item,UOM Conversion Factor,Współczynnik konwersji jednostki miary
DocType: Stock Settings,Default Item Group,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Laminated object manufacturing,Obiekt produkcyjny laminowane
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Baza dostawców
DocType: Account,Balance Sheet,
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +596,Cost Center For Item with Item Code ',"Centrum kosztów dla rzeczy z kodeksu Element """
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Stretch forming,Stretch formowania
@@ -1050,14 +1050,14 @@
DocType: Communication,Sent,Wysłano
apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Podgląd księgi
DocType: Cost Center,Lft,lft
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
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",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
DocType: Sales Order,Delivery Status,Status dostawy
DocType: Production Order,Manufacture against Sales Order,
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,Reszta świata
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
,Budget Variance Report,
-DocType: Salary Slip,Gross Pay,
+DocType: Salary Slip,Gross Pay,Płaca brutto
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dywidendy wypłacone
DocType: Stock Reconciliation,Difference Amount,Kwota różnicy
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zyski zatrzymane
@@ -1072,22 +1072,22 @@
DocType: Opportunity Item,Opportunity Item,
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tymczasowe otwarcia
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
-,Employee Leave Balance,
+,Employee Leave Balance,Bilans zwolnień pracownika
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
DocType: Sales Invoice,More Info,Więcej informacji
-DocType: Address,Address Type,
+DocType: Address,Address Type,Typ Adresu
DocType: Purchase Receipt,Rejected Warehouse,
DocType: GL Entry,Against Voucher,Na podstawie talonu
DocType: Item,Default Buying Cost Center,
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,
-,Accounts Payable Summary,Konta Płatne Podsumowanie
+,Accounts Payable Summary,Zobowiązania Podsumowanie
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
DocType: Journal Entry,Get Outstanding Invoices,
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
DocType: Email Digest,New Stock Entries,
apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged",
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,Mały
-DocType: Employee,Employee Number,
+DocType: Employee,Employee Number,Numer pracownika
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},
DocType: Material Request,% Completed,% ukończonych
,Invoiced Amount (Exculsive Tax),
@@ -1120,10 +1120,10 @@
DocType: Hub Settings,Seller Website,Sprzedawca WWW
apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Production Order status is {0},Zlecenie produkcji ma status: {0}
-DocType: Appraisal Goal,Goal,
+DocType: Appraisal Goal,Goal,Cel
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,For Supplier,Dla dostawcy
DocType: Account,Setting Account Type helps in selecting this Account in transactions.,
-DocType: Purchase Invoice,Grand Total (Company Currency),
+DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Razem Wychodzące
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""",
DocType: DocType,Transaction,
@@ -1135,7 +1135,7 @@
DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
DocType: Applicable Territory,Applicable Territory,
apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,
-DocType: Journal Entry,Journal Entry,
+DocType: Journal Entry,Journal Entry,Zapis księgowy
DocType: Workstation,Workstation Name,Nazwa stacji roboczej
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,Powiadom Digest:
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
@@ -1201,7 +1201,7 @@
DocType: Holiday List,Holidays,
DocType: Sales Order Item,Planned Quantity,Planowana ilość
DocType: Purchase Invoice Item,Item Tax Amount,Wysokość podatku dla produktu
-DocType: Supplier Quotation,Get Terms and Conditions,
+DocType: Supplier Quotation,Get Terms and Conditions,Pobierz warunki sprzedaży
DocType: Leave Control Panel,Leave blank if considered for all designations,
apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +165,Max: {0},Max: {0}
@@ -1224,16 +1224,16 @@
DocType: Warranty Claim,Warranty / AMC Status,
,Accounts Browser,Przeglądarka kont
DocType: GL Entry,GL Entry,
-DocType: HR Settings,Employee Settings,
+DocType: HR Settings,Employee Settings,Ustawienia pracownika
,Batch-Wise Balance History,
-DocType: Email Digest,To Do List,
+DocType: Email Digest,To Do List,"Lista ""Do zrobienia"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Apprentice,
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Negative Quantity is not allowed,
DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
Used for Taxes and Charges","Podatki pobierane z tabeli szczegółów mistrza poz jako ciąg znaków i przechowywane w tej dziedzinie.
Służy do podatkach i opłatach"
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.,Pracownik nie może zgłosić się do siebie.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +147,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
DocType: Job Opening,"Job profile, qualifications required etc.",
DocType: Journal Entry Account,Account Balance,Bilans konta
@@ -1256,7 +1256,7 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,
sites/assets/js/erpnext.min.js +19,No address added yet.,Nie dodano jeszcze adresu.
DocType: Workstation Working Hour,Workstation Working Hour,Godzina robocza Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Analityk
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},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
DocType: Item,Inventory,Inwentarz
DocType: Item,Sales Details,Szczegóły sprzedaży
@@ -1267,7 +1267,7 @@
DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
","Dzień, w którym będą generowane następne faktury. Jest on generowany na przedstawienia."
DocType: Item Attribute,Item Attribute,Element Atrybut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +100,Government,
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +100,Government,Rząd
DocType: Item,Re-order,Ponowne zamówienie
DocType: Company,Services,Usługi
apps/erpnext/erpnext/accounts/report/financial_statements.py +149,Total ({0}),Razem ({0})
@@ -1406,9 +1406,9 @@
DocType: Authorization Rule,Approving User,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Forging,Kucie
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Plating,Galwanizacja
-DocType: Purchase Invoice,End date of current invoice's period,
+DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
DocType: Pricing Rule,Applicable For,
-DocType: Bank Reconciliation,From Date,
+DocType: Bank Reconciliation,From Date,Od daty
DocType: Backup Manager,Validate,
DocType: Maintenance Visit,Partially Completed,
DocType: Sales Invoice,Packed Items,Pakiety przedmioty
@@ -1436,7 +1436,7 @@
DocType: Leave Allocation,Total Leaves Allocated,
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},Magazyn wymagane w wierszu nr {0}
DocType: Employee,Date Of Retirement,
-DocType: Upload Attendance,Get Template,
+DocType: Upload Attendance,Get Template,Pobierz szablon
DocType: Address,Postal,
DocType: Email Digest,Total amount of invoices sent to the customer during the digest period,
DocType: Item,Weightage,
@@ -1501,7 +1501,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,BOM {0} musi być złożony
DocType: Authorization Control,Authorization Control,
apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,
-DocType: Production Order Operation,Actual Time and Cost,Aktualny czas i koszt
+DocType: Production Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt
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},
DocType: Employee,Salutation,
DocType: Offer Letter,Rejected,
@@ -1509,7 +1509,7 @@
DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,% dostarczonych
apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,
-DocType: Sales Order Item,Actual Qty,
+DocType: Sales Order Item,Actual Qty,Rzeczywista Ilość
DocType: Quality Inspection Reading,Reading 10,Odczyt 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.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary. "
DocType: Hub Settings,Hub Node,Hub Węzeł
@@ -1535,7 +1535,7 @@
DocType: Item,Allowance Percent,Dopuszczalny procent
DocType: SMS Settings,Message Parameter,
DocType: Serial No,Delivery Document No,Nr dokumentu dostawy
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Elementy z kwitów zakupu
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Uzyskaj pozycje z potwierdzeń zakupu.
DocType: Serial No,Creation Date,Data utworzenia
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +34,Item {0} appears multiple times in Price List {1},
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Sprzedaż musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
@@ -1598,7 +1598,7 @@
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +237,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},
DocType: Account,Frozen,
,Open Production Orders,
-DocType: Installation Note,Installation Time,
+DocType: Installation Note,Installation Time,Czas instalacji
apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,"Usuń wszystkie transakcje, dla tej firmy"
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,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,
@@ -1612,7 +1612,7 @@
DocType: Task,Expected Time (in hours),Oczekiwany czas (w godzinach)
,Qty to Order,
DocType: Sales Order,PO No,
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Wykres Gantta dla wszystkich zadań.
DocType: Appraisal,For Employee Name,
DocType: Holiday List,Clear Table,Wyczyść tabelę
DocType: Features Setup,Brands,Marki
@@ -1630,7 +1630,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Para
DocType: Bank Reconciliation Detail,Against Account,
-DocType: Maintenance Schedule Detail,Actual Date,
+DocType: Maintenance Schedule Detail,Actual Date,Rzeczywista Data
DocType: Item,Has Batch No,Posada numer partii (batch)
DocType: Delivery Note,Excise Page Number,
DocType: Employee,Personal Details,
@@ -1642,7 +1642,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",
DocType: Shipping Rule Condition,Shipping Amount,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,Łączący
-DocType: Authorization Rule,Above Value,
+DocType: Authorization Rule,Above Value,Wartość Powyżej
,Pending Amount,
DocType: Purchase Invoice Item,Conversion Factor,
DocType: Serial No,Delivered,
@@ -1663,7 +1663,7 @@
apps/frappe/frappe/config/setup.py +130,Printing,Druk
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,
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.,
-sites/assets/js/desk.min.js +684,and,
+sites/assets/js/desk.min.js +684,and,i
DocType: Leave Block List Allow,Leave Block List Allow,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Sports,
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Razem Rzeczywisty
@@ -1689,7 +1689,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +51,Clearance date cannot be before check date in row {0},
DocType: Salary Slip,Deduction,
-DocType: Address Template,Address Template,Szablon Adres
+DocType: Address Template,Address Template,Szablon Adresu
DocType: Territory,Classification of Customers by region,Klasyfikacja Klientów od regionu
DocType: Project,% Tasks Completed,% Zadania Zakończone
DocType: Project,Gross Margin,Marża brutto
@@ -1786,7 +1786,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,
DocType: Purchase Invoice Item,Qty,Ilość
DocType: Fiscal Year,Companies,Firmy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +23,Electronics,
+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""",
DocType: Shipping Rule,"Specify a list of Territories, for which, this Shipping Rule is valid",Wybierz obszary dla których obowiązuje ta metoda dostawy
DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Wywołaj Zapytanie Materiałowe, gdy stan osiągnie próg ponowienia zlecenia"
@@ -1808,7 +1808,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Technology,Technologia
DocType: Purchase Order,Supplier (vendor) name as entered in supplier master,
DocType: Offer Letter,Offer Letter,Oferta List
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Razem zafakturowane Amt
DocType: Time Log,To Time,
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.",
@@ -1828,7 +1828,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,Spawanie
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,Wymagana jest nowa jednostka miary stanu
DocType: Quality Inspection,Sample Size,Wielkość próby
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
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,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
DocType: Project,External,
@@ -1836,8 +1836,8 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +8,Not Received,Nie odebrane
DocType: Branch,Branch,
DocType: Sales Invoice,Customer (Receivable) Account,
-DocType: Bin,Actual Quantity,
-DocType: Shipping Rule,example: Next Day Shipping,
+DocType: Bin,Actual Quantity,Rzeczywista Ilość
+DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Serial No {0} not found,Numer seryjny: {0} Nie znaleziono
DocType: Shopping Cart Settings,Price Lists,Cenniki
DocType: Purchase Invoice,Considered as Opening Balance,
@@ -1862,11 +1862,11 @@
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Nowa faktura sprzedaży
DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Nieprawidłowy {0}: {1}
-DocType: Sales Invoice Advance,Advance Amount,
+DocType: Sales Invoice Advance,Advance Amount,Kwota Zaliczki
DocType: Manufacturing Settings,Capacity Planning,Planowanie zdolności
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Pole 'Od daty' jest wymagane
DocType: Journal Entry,Reference Number,
-DocType: Employee,Employment Details,
+DocType: Employee,Employment Details,Szczegóły zatrudnienia
DocType: Employee,New Workplace,
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ustaw jako zamknięty
apps/erpnext/erpnext/stock/get_item_details.py +104,No Item with Barcode {0},
@@ -1901,7 +1901,7 @@
DocType: Quality Inspection,Purchase Receipt No,Nr dowodu zakupu
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,
DocType: Salary Manager,Create Salary Slip,Utwórz pasek wynagrodzenia
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +44,Expected balance as per bank,Oczekiwany saldo na bank
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +44,Expected balance as per bank,Oczekiwane saldo wg banków
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,Polerowanie
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},
@@ -1911,7 +1911,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
DocType: Workstation Working Hour,End Time,Czas zakończenia
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,Grupuj według bonu
apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane dniu
DocType: Sales Invoice,Mass Mailing,
DocType: Page,Standard,
@@ -1958,7 +1958,7 @@
DocType: Employee,Previous Work Experience,
DocType: Stock Entry,For Quantity,Na Ilość
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} nie zostało dodane
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Zamówienia produktów.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,
DocType: Email Digest,New Communications,
@@ -1970,7 +1970,7 @@
DocType: UOM,Check this to disallow fractions. (for Nos),
apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,Biuletyn Mailing List
DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
-DocType: Contact,Enter department to which this Contact belongs,
+DocType: Contact,Enter department to which this Contact belongs,"Wpisz dział, to którego należy ten kontakt"
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Razem Nieobecny
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,
apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jednostka miary
@@ -1986,11 +1986,11 @@
DocType: Purchase Receipt,Get Current Stock,Pobierz aktualny stan magazynowy
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},
-DocType: Production Order,Actual End Date,
+DocType: Production Order,Actual End Date,Rzeczywista Data Zakończenia
DocType: Authorization Rule,Applicable To (Role),
DocType: Stock Entry,Purpose,Cel
DocType: Item,Will also apply for variants unless overrridden,Również zastosowanie do wariantów chyba overrridden
-DocType: Purchase Invoice,Advances,
+DocType: Purchase Invoice,Advances,Zaliczki
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,
DocType: SMS Log,No of Requested SMS,
DocType: Campaign,Campaign-.####,Kampania-.####
@@ -2056,7 +2056,7 @@
DocType: Payment Reconciliation,Bank / Cash Account,Konto bankowe / Gotówka
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Zostaw Ta aplikacja oczekuje na zatwierdzenie. Tylko Zostaw zatwierdzająca może aktualizować status.
DocType: Global Defaults,Hide Currency Symbol,
-apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card",
+apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
DocType: Journal Entry,Credit Note,
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +206,Completed Qty cannot be more than {0} for operation {1},Zakończono Ilość nie może zawierać więcej niż {0} do pracy {1}
DocType: Features Setup,Quality,Jakość
@@ -2090,12 +2090,12 @@
apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +20,Payment Type,
DocType: Salary Manager,Select Employees,Wybierz Pracownicy
-DocType: Bank Reconciliation,To Date,
+DocType: Bank Reconciliation,To Date,Do daty
DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
sites/assets/js/form.min.js +286,Details,
DocType: Purchase Invoice,Total Taxes and Charges,
DocType: Email Digest,Payments Made,
-DocType: Employee,Emergency Contact,
+DocType: Employee,Emergency Contact,Kontakt na wypadek nieszczęśliwych wypadków
DocType: Item,Quality Parameters,Parametry jakościowe
DocType: Target Detail,Target Amount,
DocType: Shopping Cart Settings,Shopping Cart Settings,Koszyk Ustawienia
@@ -2159,7 +2159,7 @@
apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},
DocType: Sales Invoice,Debit To,
DocType: Delivery Note,Required only for sample item.,
-DocType: Stock Ledger Entry,Actual Qty After Transaction,
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
,Pending SO Items For Purchase Request,
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,Bardzo Duży
,Profit and Loss Statement,Rachunek zysków i strat
@@ -2185,7 +2185,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row{0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Strona Typ i Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {0} is cancelled,
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Łączna kwota
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pracownik {0} był na zwolnieniu {1}. Nie można zaznaczyć obecności.
DocType: Sales Partner,Targets,Cele
DocType: Price List,Price List Master,Cennik Mistrz
DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
@@ -2196,9 +2196,9 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Electro-chemical grinding,Szlifowanie elektrochemicznych
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Należy stworzyć własny Plan Kont zanim rozpocznie się księgowanie
-DocType: Purchase Invoice,Ignore Pricing Rule,Ignoruj Ceny Rule
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignoruj Reguły Cen
sites/assets/js/list.min.js +23,Cancelled,Anulowano
-DocType: Employee Education,Graduate,
+DocType: Employee Education,Graduate,Absolwent
DocType: Leave Block List,Block Days,
DocType: Journal Entry,Excise Entry,Akcyza Wejście
DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2273,7 +2273,7 @@
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.,Rabat procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
DocType: Purchase Invoice,Half-yearly,
apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Rok fiskalny {0} nie został znaleziony.
-DocType: Bank Reconciliation,Get Relevant Entries,
+DocType: Bank Reconciliation,Get Relevant Entries,Pobierz odpowiednie pozycje
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,Wejście Rachunkowość akcji
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,Coining
DocType: Sales Invoice,Sales Team1,
@@ -2300,7 +2300,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalny poziom zapasów
DocType: Stock Entry,Subcontract,Zlecenie
-DocType: Production Planning Tool,Get Items From Sales Orders,
+DocType: Production Planning Tool,Get Items From Sales Orders,Uzyskaj pozycje z zamówień sprzedaży
DocType: Production Order Operation,Actual End Time,Rzeczywisty czas zakończenia
DocType: Production Planning Tool,Download Materials Required,
DocType: Item,Manufacturer Part Number,Numer katalogowy producenta
@@ -2319,7 +2319,7 @@
apps/erpnext/erpnext/stock/get_item_details.py +253,Price List Currency not selected,
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,Pozycja Wiersz {0}: Zakup Otrzymanie {1} nie istnieje w tabeli powyżej Zakup kwitów ''
DocType: Pricing Rule,Applicability,
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3}
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
DocType: Rename Tool,Rename Log,
@@ -2367,7 +2367,7 @@
DocType: Salary Structure,Salary breakup based on Earning and Deduction.,
apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
DocType: Address,Preferred Shipping Address,
-DocType: Purchase Receipt Item,Accepted Warehouse,
+DocType: Purchase Receipt Item,Accepted Warehouse,Przyjęty Magazyn
DocType: Bank Reconciliation Detail,Posting Date,Data publikacji
DocType: Item,Valuation Method,Metoda wyceny
DocType: Sales Invoice,Sales Team,
@@ -2384,7 +2384,7 @@
DocType: Pricing Rule,Discount Percentage,Procent rabatu
DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,Zamówienia
-DocType: Leave Control Panel,Employee Type,
+DocType: Leave Control Panel,Employee Type,Typ pracownika
DocType: Employee Leave Approver,Leave Approver,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,Kucie
DocType: Expense Claim,"A user with ""Expense Approver"" role","Użytkownik z ""Koszty zatwierdzająca"" roli"
@@ -2436,7 +2436,7 @@
DocType: Lead,Market Segment,
DocType: Communication,Phone,Telefon
DocType: Purchase Invoice,Supplier (Payable) Account,
-DocType: Employee Internal Work History,Employee Internal Work History,
+DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +192,Closing (Dr),Zamknięcie (dr)
DocType: Contact,Passive,
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +242,Serial No {0} not in stock,
@@ -2454,7 +2454,7 @@
DocType: Purchase Invoice,Total Amount To Pay,
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,
DocType: Event,Groups,Grupy
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,Grupuj według konta
DocType: Sales Order,Fully Delivered,Całkowicie Dostawa
DocType: Lead,Lower Income,
DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",
@@ -2482,7 +2482,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},
DocType: Maintenance Schedule Item,Maintenance Schedule Item,
-DocType: Sales Order,% Delivered,% dostarczonych
+DocType: Sales Order,% Delivered,% dostarczono
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kredyt w rachunku bankowym
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,
@@ -2516,7 +2516,7 @@
DocType: Purchase Receipt Item,Purchase Order Item No,Nr elementu Zlecenia zakupu
DocType: System Settings,System Settings,Ustawienia Systemowe
DocType: Project,Project Type,
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,wymagana jest docelowa ilość lub kwota.
apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Koszt różnych działań
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +93,Not allowed to update stock transactions older than {0},Niedozwolona jest modyfikacja transakcji zapasów starszych niż {0}
DocType: Item,Inspection Required,Wymagana kontrola
@@ -2577,7 +2577,7 @@
DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
DocType: Email Digest,Expenses booked for the digest period,
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,
-DocType: Journal Entry Account,Journal Entry Account,Dz konto Wejście
+DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
DocType: Shopping Cart Settings,Quotation Series,Notowanie serii
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",Istnieje element o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,Gorący gaz formowania metali
@@ -2586,7 +2586,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazyn {0}: Firma jest obowiązkowe
DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,Procentowa wariacja w ilości dopuszczalna przy otrzymywaniu lub dostarczaniu tego produktu.
DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,Koszyk Koszyk Mistrz podatków i opłat
-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.","Idź do odpowiedniej grupy (zwykle źródło funduszy> Zobowiązania krótkoterminowe> Podatki i cła i utworzyć nowe konto (klikając na Dodaj Child) typu "podatek", a nie mówiąc już o stawkę podatku."
+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.","Idź do odpowiedniej grupy (zwykle źródło funduszy> Zobowiązania krótkoterminowe> Podatki i cła i utworzyć nowe konto (klikając na Dodaj Child) typu ""podatek"" i ustal stawkę podatku."
,Payment Period Based On Invoice Date,
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +113,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Laser cutting,Cięcie laserowe
@@ -2607,7 +2607,7 @@
apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,"W przypadku, gdy czynności wytwórcze są prowadzone."
DocType: Page,All,Wszystko
DocType: Stock Entry Detail,Source Warehouse,Magazyn źródłowy
-DocType: Installation Note,Installation Date,
+DocType: Installation Note,Installation Date,Data instalacji
DocType: Employee,Confirmation Date,Data potwierdzenia
DocType: C-Form,Total Invoiced Amount,
DocType: Communication,Sales User,Sprzedaż użytkownika
@@ -2724,7 +2724,7 @@
DocType: Sales Person,Sales Person Name,
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,
DocType: Pricing Rule,Item Group,Grupa produktów
-DocType: Task,Actual Start Date (via Time Logs),Faktyczna data rozpoczęcia (przez Time Logs)
+DocType: Task,Actual Start Date (via Time Logs),Rzeczywista Data Rozpoczęcia (przez Time Logs)
DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),
@@ -2746,14 +2746,14 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Wybierz swój kraj, strefę czasową i walutę"
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0}{1} stan jest Niezastopowany
DocType: Purchase Invoice,Price List Exchange Rate,
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,Marynowanie
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,Odlewy piaskowe
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Electroplating,Galwanotechnika
DocType: Purchase Invoice Item,Rate,Stawka
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Intern,
-DocType: Newsletter,A Lead with this email id should exist,
+DocType: Newsletter,A Lead with this email id should exist,Sygnał z tym adresem e-mail powinien istnieć
DocType: Stock Entry,From BOM,Od BOM
DocType: Time Log,Billing Rate (per hour),Kursy rozliczeniowe (za godzinę)
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
@@ -2814,14 +2814,14 @@
DocType: Leave Application,Follow via Email,
DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,
apps/erpnext/erpnext/accounts/doctype/account/account.py +146,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,wymagana jest docelowa ilość lub kwota
apps/erpnext/erpnext/stock/get_item_details.py +421,No default BOM exists for Item {0},
DocType: Leave Allocation,Carry Forward,
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cost Center with existing transactions can not be converted to ledger,
DocType: Department,Days for which Holidays are blocked for this department.,
,Produced,
DocType: Issue,Raised By (Email),
-DocType: Email Digest,General,
+DocType: Email Digest,General,Ogólne
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +244,Serial Nos Required for Serialized Item {0},
@@ -2829,11 +2829,11 @@
DocType: Authorization Rule,Applicable To (Designation),
DocType: Blog Post,Blog Post,
apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,Dodaj do Koszyka
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupa przez
-apps/erpnext/erpnext/config/accounts.py +133,Enable / disable currencies.,
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupuj według
+apps/erpnext/erpnext/config/accounts.py +133,Enable / disable currencies.,Włącz/wyłącz waluty.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Wydatki pocztowe
apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,Rozrywka i relaks
DocType: Purchase Order,The date on which recurring order will be stop,Data powracającym zamówienie zostanie zatrzymać
DocType: Quality Inspection,Item Serial No,Nr seryjny produktu
apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
@@ -3001,7 +3001,7 @@
DocType: Sales Order,% Amount Billed,% wartości rozliczonej
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Wydatki telefoniczne
DocType: Sales Partner,Logo,
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} Numer Seryjny wymagany dla Pozycji {0}. Podano tylko {0}.
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 +108,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Wydatki bezpośrednie
@@ -3060,7 +3060,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +366,{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}."
apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
DocType: Purchase Invoice Item,Price List Rate (Company Currency),
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0}{1} stan jest 'Zastopowany'
DocType: Account,Temporary,Tymczasowy
DocType: Address,Preferred Billing Address,
DocType: Monthly Distribution Percentage,Percentage Allocation,
@@ -3068,7 +3068,7 @@
DocType: Serial No,Distinct unit of an Item,Wyraźny jednostkowych pozycji
apps/erpnext/erpnext/config/setup.py +96,Item master.,
DocType: Pricing Rule,Buying,Zakupy
-DocType: HR Settings,Employee Records to be created by,
+DocType: HR Settings,Employee Records to be created by,Rekordy pracownika do utworzenia przez
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,
DocType: Purchase Invoice,Apply Discount On,Zastosuj RABAT
DocType: Salary Slip Earning,Salary Slip Earning,
@@ -3134,7 +3134,7 @@
apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,
DocType: Item,Taxes,Podatki
DocType: Project,Default Cost Center,Domyślnie MPK
-DocType: Purchase Invoice,End Date,
+DocType: Purchase Invoice,End Date,Data zakończenia
DocType: Employee,Internal Work History,Wewnętrzne Historia Pracuj
DocType: DocField,Column Break,
DocType: Event,Thursday,Czwartek
@@ -3142,7 +3142,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Turning,Obrócenie
DocType: Maintenance Visit,Customer Feedback,
DocType: Account,Expense,Koszt
-DocType: Sales Invoice,Exhibition,
+DocType: Sales Invoice,Exhibition,Wystawa
apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +28,Submit this Production Order for further processing.,
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.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone."
@@ -3150,7 +3150,7 @@
,Sales Order Trends,
DocType: Employee,Held On,
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +24,Production Item,Pozycja Produkcja
-,Employee Information,
+,Employee Information,Informacja o pracowniku
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,Rate (%),Stawka (%)
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year End Date,
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,"Can not filter based on Voucher No, if grouped by Voucher",
@@ -3180,7 +3180,7 @@
DocType: Stock Ledger Entry,Stock Ledger Entry,Zapis w księdze zapasów
DocType: Department,Leave 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,
-DocType: Accounts Settings,Accounts Settings,
+DocType: Accounts Settings,Accounts Settings,Ustawienia Kont
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,
DocType: Item,You can enter the minimum quantity of this item to be ordered.,"Można wpisać minimalna ilość tego produktu, którą zamierza się zamawiać."
DocType: Sales Partner,Partner's Website,
@@ -3201,7 +3201,7 @@
DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrotu kosztów (przez Kosztów zastrzeżenia)
apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +65,Customer Id,ID klienta
DocType: Page,Page Name,
-DocType: Purchase Invoice,Exchange Rate,
+DocType: Purchase Invoice,Exchange Rate,Kurs wymiany
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazyn {0}: Konto nadrzędne {1} nie należy do firmy {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Wykończenie wrzeciona
@@ -3235,7 +3235,7 @@
DocType: Payment Tool Detail,Against Voucher No,Na podstawie talonu nr
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +46,Please enter quantity for Item {0},
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,
-DocType: Employee External Work History,Employee External Work History,
+DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
DocType: Notification Control,Purchase,Zakup
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,
@@ -3245,7 +3245,7 @@
apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Magazyny.
DocType: Purchase Order,Rate at which supplier's currency is converted to company's base currency,
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Wiersz # {0}: taktowania konflikty z rzędu {1}
-DocType: Employee,Employment Type,
+DocType: Employee,Employment Type,Typ zatrudnienia
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Majątek trwały
DocType: Item Group,Default Expense Account,Domyślne konto rozchodów
DocType: Employee,Notice (days),
@@ -3270,7 +3270,7 @@
sites/assets/js/erpnext.min.js +5,Add Serial No,Dodaj nr seryjny
DocType: Production Order,Warehouses,Magazyny
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Materiały biurowe
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,Węzeł Grupa
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,Węzeł Grupy
DocType: Payment Reconciliation,Minimum Amount,Minimalna wielkość
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,
DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Ustawiana automatycznie. Jeśli ten element ma warianty, to nie może być wybrany w zleceniach sprzedaży itp"
@@ -3302,7 +3302,7 @@
DocType: Journal Entry,Write Off Entry,Napisz Off Entry
DocType: BOM,Rate Of Materials Based On,
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,
-DocType: Journal Entry,eg. Cheque Number,
+DocType: Journal Entry,eg. Cheque Number,np. numer czeku
apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +25,Company is missing in warehouses {0},
DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,
DocType: POS Setting,Terms and Conditions,Regulamin
@@ -3318,7 +3318,7 @@
DocType: Project Task,View Task,Zobacz Task
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,Rozpoczęcie roku podatkowego
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Wprowadź dokumenty zakupu
-DocType: Sales Invoice,Get Advances Received,
+DocType: Sales Invoice,Get Advances Received,Uzyskaj otrzymane zaliczki
DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Transaction not allowed against stopped Production Order {0},
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",
@@ -3329,7 +3329,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Nagniatania
DocType: Features Setup,To enable <b>Point of Sale</b> view,
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'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.","Generowanie pakowania zrazy na pakiety mają być dostarczone. Służy do powiadamiania numer przesyłki, zawartość opakowania i jego ciężar."
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Utwórz paski na opakowania do dostawy. Używane do informacji o numerze opakowania, zawartości i wadze."
DocType: Sales Invoice Item,Sales Order Item,Pozycja Zlecenia Sprzedaży
DocType: Salary Slip,Payment Days,
DocType: BOM,Manage cost of operations,Zarządzaj kosztami działań
@@ -3338,7 +3338,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Hot rolling,Walcowanie na gorąco
DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",
apps/erpnext/erpnext/config/setup.py +101,Customer master.,
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Ustawienia globalne
DocType: Employee Education,Employee Education,Wykształcenie pracownika
DocType: Salary Slip,Net Pay,
DocType: Account,Account,Konto
@@ -3382,7 +3382,7 @@
,General Ledger,Księga główna
apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobacz Przewody
DocType: Item Attribute Value,Attribute Value,Wartość atrybutu
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID nie może się powtarzać, ten już zajęty dla {0} "
,Itemwise Recommended Reorder Level,
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +216,Please select {0} first,
DocType: Features Setup,To get Item Group in details table,
@@ -3420,9 +3420,9 @@
apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,
,Project wise Stock Tracking,
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},
-DocType: Stock Entry Detail,Actual Qty (at source/target),
+DocType: Stock Entry Detail,Actual Qty (at source/target),Rzeczywista Ilość (u źródła/celu)
DocType: Item Customer Detail,Ref Code,
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Rekordy pracownika.
DocType: HR Settings,Payroll Settings,
apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,
DocType: Email Digest,New Purchase Orders,
@@ -3435,7 +3435,7 @@
DocType: Warranty Claim,Resolved By,
DocType: Appraisal,Start Date,
sites/assets/js/desk.min.js +512,Value,
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Przydziel zwolnienia dla tego okresu.
apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
DocType: Purchase Invoice Item,Price List Rate,
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,
@@ -3453,9 +3453,9 @@
DocType: Maintenance Visit,Fully Completed,
DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.",
apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Kompletna
-DocType: Employee,Educational Qualification,
+DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
DocType: Workstation,Operating Costs,Koszty operacyjne
-DocType: Employee Leave Approver,Employee Leave Approver,
+DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
apps/erpnext/erpnext/templates/includes/footer_extension.html +9,Stay Updated,
apps/erpnext/erpnext/stock/doctype/item/item.py +376,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +66,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
@@ -3482,7 +3482,7 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,
-DocType: Purchase Invoice Item,Amount (Company Currency),
+DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,Odlewów
DocType: Email Alert,Reference Date,
apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,
@@ -3505,7 +3505,7 @@
DocType: Purchase Receipt Item,Received and Accepted,
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","Zmniejszyć liczbę, wyższy priorytet w Kodeksie przyrostkiem Element, który zostanie utworzony dla tej pozycji Attribute Item Variant"
,Serial No Service Contract Expiry,
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employee can not be changed,Pracownik nie może być zmieniona
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employee can not be changed,Pracownik nie może być zmieniony
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
DocType: Naming Series,Help HTML,
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},
@@ -3529,10 +3529,10 @@
DocType: Purchase Receipt,Date on which lorry started from supplier warehouse,
DocType: Cost Center,Budgets,Budżety
apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,
-DocType: Employee,Emergency Contact Details,
+DocType: Employee,Emergency Contact Details,Kontakt na wypadek nieszczęśliwych wypadków - szczegóły
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it do?,Czym się zajmuje?
DocType: Delivery Note,To Warehouse,Do magazynu
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Konto {0} zostało wprowadzone więcej niż raz dla roku podatkowego {1}
,Average Commission Rate,Średnia prowizja
apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"Numer seryjny nie może być dostępny dla produktów, które nie są magazynowane"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,
@@ -3540,7 +3540,7 @@
DocType: Purchase Taxes and Charges,Account Head,
DocType: Price List,"Specify a list of Territories, for which, this Price List is valid","Wybierz obszary, na których obowiącuje ten cennik"
apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Uwzględnij dodatkowe kwoty do obliczenia całkowitego kosztu operacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +106,Electrical,
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +106,Electrical,Elektryczne
DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',Konto różnica obowiązkowe dla celów '{0}'
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},
@@ -3567,7 +3567,7 @@
,Ordered Qty,
DocType: Stock Settings,Stock Frozen Upto,
apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Utwórz Paski Wypłaty
apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} błędny identyfikator e-mail
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,
@@ -3580,16 +3580,16 @@
DocType: Offer Letter,Offer Letter Terms,Oferta Letter Warunki
DocType: Features Setup,To track any installation or commissioning related work after sales,
DocType: Project,Estimated Costing,Szacowany Costing
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Księgowanie Szczegóły Nie
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Nr zapisu szczegółowego
DocType: Employee External Work History,Salary,Wynagrodzenia
DocType: Serial No,Delivery Document Type,Typ dokumentu dostawy
DocType: Salary Manager,Submit all salary slips for the above selected criteria,
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} - przedmioty synchronizowane
DocType: Sales Order,Partly Delivered,
-DocType: Sales Invoice,Existing Customer,
+DocType: Sales Invoice,Existing Customer,Istniejący Klient
DocType: Email Digest,Receivables,
DocType: Quality Inspection Reading,Reading 5,Odczyt 5
-DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Wprowadź identyfikator e-mail oddzielone przecinkami, zamówienie zostanie wysłane automatycznie w określonym dniu"
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Wpisz Email ID oddzielone przecinkami, zamówienie zostanie wysłane automatycznie określonego dnia"
apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nazwa kampanii jest wymagana
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,
DocType: Maintenance Visit,Maintenance Date,
@@ -3601,7 +3601,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +46,Show Balance,Pokaż Saldo
DocType: Item,"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.","Przykład:. ABCD #####
- Jeśli seria jest ustawiony i nr seryjny nie jest wymienione w transakcji, a następnie automatyczne numer seryjny zostanie utworzona na podstawie tej serii. Jeśli chcesz zawsze wyraźnie o numerach dla tej pozycji. pozostaw to pole puste."
+ Jeśli seria jest ustawiona i nr seryjny nie jest wymieniony w transakcjach, automatyczny numer seryjny zostanie utworzony na podstawie tej serii. Jeśli chcesz zawsze jednoznacznie ustawiać numery seryjne dla tej pozycji, pozostaw to pole puste."
DocType: Upload Attendance,Upload Attendance,
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
@@ -3648,7 +3648,7 @@
DocType: BOM,Raw Material Cost,Koszt surowców
DocType: Item Reorder,Re-Order Level,Próg ponowienia zamówienia
DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,
-sites/assets/js/list.min.js +160,Gantt Chart,
+sites/assets/js/list.min.js +160,Gantt Chart,Wykres Gantta
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,
DocType: Employee,Applicable Holiday List,
DocType: Employee,Cheque,Czek
@@ -3711,14 +3711,14 @@
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,
DocType: User,Last Name,Nazwisko
DocType: Web Page,Left,
-DocType: Event,All Day,
+DocType: Event,All Day,Cały Dzień
DocType: Communication,Support Team,Support Team
DocType: Appraisal,Total Score (Out of 5),
DocType: Contact Us Settings,State,Stan
DocType: Batch,Batch,Partia
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,Bilans
DocType: Project,Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez Zastrzeżeń koszty)
-DocType: User,Gender,
+DocType: User,Gender,Płeć
DocType: Journal Entry,Debit Note,
DocType: Stock Entry,As per Stock UOM,
apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nie minął
@@ -3741,7 +3741,7 @@
DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Utrzymaj tą samą stawkę przez cały cykl sprzedaży
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},
DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Workstation Pracy.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} zostało już dodane
,Items To Be Requested,
DocType: Purchase Order,Get Last Purchase Rate,
DocType: Company,Company Info,Informacje o firmie
@@ -3750,7 +3750,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),
DocType: Production Planning Tool,Filter based on item,
DocType: Fiscal Year,Year Start Date,
-DocType: Attendance,Employee Name,
+DocType: Attendance,Employee Name,Nazwisko pracownika
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit To account must be a liability account,Obciążenie rachunku musi być rachunek zobowiązań
DocType: Sales Invoice,Rounded Total (Company Currency),
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
@@ -3768,7 +3768,7 @@
DocType: DocField,Default,
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",Wybranie “Tak” pozwoli na dostępność tego produktu w Zamówieniach i Potwierdzeniach Odbioru
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonentów dodany
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonentów dodano
DocType: Maintenance Schedule,Schedule,Harmonogram
DocType: Account,Parent Account,Nadrzędne konto
DocType: Serial No,Available,Dostępny
@@ -3780,7 +3780,7 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as '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.","Wybranie ""Tak"" pozwoli w unikalny sposób identyfikować każdą pojedynczą sztukę tej rzeczy i która będzie mogła być przeglądana w sekcji Nr Seryjny"
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,
-DocType: Employee,Education,
+DocType: Employee,Education,Wykształcenie
DocType: Selling Settings,Campaign Naming By,
DocType: Employee,Current Address Is,
DocType: Address,Office,Biuro
@@ -3809,14 +3809,14 @@
DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
DocType: Notification Control,Purchase Receipt Message,
-DocType: Production Order,Actual Start Date,
+DocType: Production Order,Actual Start Date,Rzeczywista data rozpoczęcia
DocType: Sales Order,% of materials delivered against this Sales Order,% materiałów dostarczonych w ramach zlecenia sprzedaży
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Zapisz ruch produktu.
DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biuletyn Lista Abonent
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Dłutarki
DocType: Email Account,Service,Usługa
DocType: Hub Settings,Hub Settings,Ustawienia Hub
-DocType: Project,Gross Margin %,
+DocType: Project,Gross Margin %,Marża brutto %
DocType: BOM,With Operations,Wraz z działaniami
,Monthly Salary Register,
apps/frappe/frappe/website/template.py +120,Next,Dalej
@@ -3837,11 +3837,11 @@
DocType: SMS Settings,Static Parameters,
DocType: Purchase Order,Advance Paid,Zaliczka
DocType: Item,Item Tax,Podatek dla produktu
-DocType: Expense Claim,Employees Email Id,
+DocType: Expense Claim,Employees Email Id,Email ID pracownika
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Zobowiązania
apps/erpnext/erpnext/config/crm.py +43,Send mass SMS to your contacts,
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +53,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +53,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
DocType: Item,"Select ""Yes"" if you are maintaining stock of this item in your Inventory.",Wybierz “Tak” jeśli produkt jest przechowywany w magazynie.
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +415,Item {0} does not exist in {1} {2},
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cross-rolling,Cross-walcówka
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index ff17418..5e66fef 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -120,7 +120,7 @@
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,Pai item {0} não deve ser Stock item e deve ser um item de vendas
DocType: Item,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Taxa / 60) * Tempo real Operação
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Taxa / 60) * Tempo de operação atual
DocType: SMS Log,SMS Log,Log de SMS
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
DocType: Blog Post,Guest,Convidado
@@ -1377,7 +1377,7 @@
DocType: Party Type,Contacts,Contatos
apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,Instalação concluída
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Tida
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Cobrada
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,reservados Qtde
DocType: Party Account,Party Account,Conta Party
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Recursos Humanos
@@ -1521,7 +1521,7 @@
DocType: Packing Slip,To Package No.,Para Pacote Nº.
DocType: DocType,System,Sistema
DocType: Warranty Claim,Issue Date,Data da Questão
-DocType: Activity Cost,Activity Cost,Atividade Custo
+DocType: Activity Cost,Activity Cost,Custo de atividade
DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Telecomunicações
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Projecto)
@@ -2259,7 +2259,7 @@
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base da empresa
DocType: Purchase Invoice,Discount Amount (Company Currency),Montante Discount (Empresa de moeda)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso a partir desta lista.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso desta lista.
DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Gerenciar territórios
DocType: Payment Reconciliation Payment,Sales Invoice,Nota Fiscal de Venda
@@ -2622,7 +2622,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
DocType: Sales Invoice,Against Income Account,Contra a Conta de Rendimentos
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Proferido
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Entregue
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).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
DocType: Territory,Territory Targets,Metas do Território
@@ -3769,7 +3769,7 @@
DocType: DocField,Default,Padrão
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Selecionando "Sim" vai permitir que este item apareça na Ordem de Compra, Recibo de Compra."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} assinantes acrescentado
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} assinantes acrescentados
DocType: Maintenance Schedule,Schedule,Agendar
DocType: Account,Parent Account,Conta pai
DocType: Serial No,Available,Disponível
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index ffb5f18..e9ee838 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -7,13 +7,13 @@
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consumer Products,Produse consumator
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +72,Please select Party Type first,Vă rugăm să selectați Party Type primul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,Recoacerea
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,Refacere
DocType: Item,Customer Items,Articole clientului
apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
DocType: Item,Publish Item to hub.erpnext.com,Publica Postul de hub.erpnext.com
apps/erpnext/erpnext/config/setup.py +63,Email Notifications,Notificări Email
DocType: Item,Default Unit of Measure,Unitatea de Măsură Implicita
-DocType: SMS Center,All Sales Partner Contact,Toate Contactele Partenerului de Vânzări
+DocType: SMS Center,All Sales Partner Contact,Toate contactele partenerului de vânzări
DocType: Employee,Leave Approvers,Aprobatori Concediu
DocType: Sales Partner,Dealer,Comerciant
DocType: Employee,Rented,Închiriate
@@ -26,17 +26,17 @@
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,Vă rugăm să introduceți ID-ul angajatului din acest Parson vânzări
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},Vă rugăm să setați tastele de acces disk Google în {0}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,Din Cerere de Material
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0} copac
-DocType: Job Applicant,Job Applicant,Solicitant Loc de Muncă
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0} arbore
+DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nu mai multe rezultate.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,Juridic
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Taxa de tip real nu poate fi inclus în tariful postul în rândul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Taxa efectivă de tip nu poate fi inclusă în tariful articolului din rândul {0}
DocType: C-Form,Customer,Client
DocType: Purchase Receipt Item,Required By,Cerute de
DocType: Department,Department,Departament
DocType: Purchase Order,% Billed,% Facurat
-DocType: Selling Settings,Customer Name,Nume Client
-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.","Toate campurile legate de export, cum ar fi moneda, rata de conversie, export total, export total general etc. sunt disponibile în Nota de Livrare, POS, Cotatie, Factura Vanzare, Comandă de Vânzări, etc"
+DocType: Selling Settings,Customer Name,Nume client
+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.","Toate câmpurile legate de export, cum ar fi moneda, rata de conversie, export total, export total general etc. sunt disponibile în notă de livrare, POS, Cotație, factură de vânzări, comandă de vânzări, etc"
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (sau grupuri) față de care înregistrările contabile sunt făcute și soldurile sunt menținute.
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
@@ -46,13 +46,13 @@
DocType: Pricing Rule,Apply On,Se aplică pe
DocType: Item Price,Multiple Item prices.,Mai multe prețuri element.
,Purchase Order Items To Be Received,Achiziția comandă elementele de încasat
-DocType: SMS Center,All Supplier Contact,Toate Contactele Furnizorului
+DocType: SMS Center,All Supplier Contact,Toate contactele furnizorului
DocType: Quality Inspection Reading,Parameter,Parametru
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +52,Please specify a Price List which is valid for Territory,Vă rugăm să specificați o listă de prețuri care este valabil pentru Teritoriului
apps/erpnext/erpnext/projects/doctype/project/project.py +35,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +235,Do really want to unstop production order:,Doriti intr-adevar sa nu opriti Ordinul de Productie:
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Noua cerere de concediu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,Ciorna de Banca
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,Ciorna bancară
DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Pentru a menține codul de client element înțelept și pentru a le face pe baza utilizării lor cod de această opțiune
DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
apps/erpnext/erpnext/stock/doctype/item/item.js +60,Show Variants,Arată Variante
@@ -85,7 +85,7 @@
DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log activităților efectuate de utilizatori, contra Sarcinile care pot fi utilizate pentru timpul de urmărire, facturare."
,Sales Partners Commission,Agent vânzări al Comisiei
apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,Prescurtarea nu poate contine mai mult de 5 caractere
-DocType: Backup Manager,Allow Google Drive Access,Permite accesul Google Drive
+DocType: Backup Manager,Allow Google Drive Access,Permiteţi accesul Google Drive
DocType: Email Digest,Projects & System,Proiecte & System
DocType: Print Settings,Classic,Clasic
apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Acesta este un cont de rădăcină și nu pot fi editate.
@@ -93,7 +93,7 @@
DocType: BOM,Operations,Operatii
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nu se poate seta autorizare pe baza de Discount pentru {0}
DocType: Bin,Quantity Requested for Purchase,Cantitate solicitată de cumparare
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Atașați fișier .csv cu două coloane, una pentru numele vechi și unul pentru noul nume"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Atașați fișier .csv cu două coloane, una pentru denumirea veche și unul pentru denumirea nouă"
DocType: Packed Item,Parent Detail docname,Părinte Detaliu 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.,Deschidere pentru un loc de muncă.
@@ -106,7 +106,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +93,Make Bank Entry,Asigurați-Bank intrare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Pension Funds,Fondurile de pensii
apps/erpnext/erpnext/accounts/doctype/account/account.py +116,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
-DocType: SMS Center,All Sales Person,Toate Persoanele de Vânzăril
+DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
DocType: Backup Manager,Credentials,Scrisori de Recomandare
DocType: Purchase Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verificați dacă comanda recurente, debifați pentru a opri recurente sau încearcă propriu Data de încheiere"
DocType: Sales Invoice Item,Sales Invoice Item,Factură de vânzări Postul
@@ -115,21 +115,21 @@
DocType: POS Setting,Write Off Cost Center,Scrie Off cost Center
DocType: Warehouse,Warehouse Detail,Depozit Detaliu
apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {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},Tu nu sunt autorizate să adăugați sau actualizare intrări înainte de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {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,Părinte Articol {0} nu trebuie să fie Stock Articol și trebuie să fie un element de vânzări
DocType: Item,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Există un client cu același nume
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Tarif / 60) * Actual Timp de operare
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
DocType: SMS Log,SMS Log,SMS Conectare
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costul de articole livrate
DocType: Blog Post,Guest,Oaspete
-DocType: Quality Inspection,Get Specification Details,Obtine Detalii Specificatii
+DocType: Quality Inspection,Get Specification Details,Obține detaliile specificațiilor
DocType: Lead,Interested,Interesat
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Factura de Material
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Factură de material
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},De la {0} {1} la
DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
DocType: Journal Entry,Opening Entry,Deschiderea de intrare
-apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} este obligatorie
+apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} este obligatoriu
apps/erpnext/erpnext/config/setup.py +111,Contact master.,Director Persoana de Contact.
apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
DocType: Lead,Product Enquiry,Intrebare produs
@@ -154,16 +154,16 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,Consumabile
DocType: Upload Attendance,Import Log,Import Conectare
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Trimiteți
-DocType: SMS Center,All Contact,Toate Contactele
+DocType: SMS Center,All Contact,Toate contactele
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Salariu anual
DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Cheltuieli stoc
DocType: Newsletter,Email Sent?,Email Trimis?
DocType: Journal Entry,Contra Entry,Contra intrare
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,Arată timp Busteni
-DocType: Email Digest,Bank/Cash Balance,Balanta Banca/Numerar
+DocType: Email Digest,Bank/Cash Balance,Balanţă bancară/numerară
DocType: Delivery Note,Installation Status,Starea de instalare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant Acceptata + Respinsa trebuie să fie egală cu cantitatea Receptionata pentru articolul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
DocType: Item,Supply Raw Materials for Purchase,Materii prime de alimentare pentru cumparare
apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,Articolul {0} trebuie să fie un Articol de Cumparare
DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -178,7 +178,7 @@
DocType: BOM Replace Tool,New BOM,Nou BOM
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +132,There were no updates in the items selected for this digest.,Nu au existat actualizări în elementele selectate pentru acest buletin.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Countergravity casting,Turnare Countergravity
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +28,Newsletter has already been sent,Newsletter a fost deja trimisa
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +28,Newsletter has already been sent,Newsletter-ul a fost deja trimis
DocType: Lead,Request Type,Cerere tip
DocType: Leave Application,Reason,motiv
DocType: Purchase Invoice,The rate at which Bill Currency is converted into company's base currency,Rata la care Bill valuta este convertit în moneda de bază a companiei
@@ -198,7 +198,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data de instalare nu poate fi înainte de data de livrare pentru postul {0}
sites/assets/js/form.min.js +261,Start,Început(Pornire)
DocType: User,First Name,Prenume
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,Configurarea dvs. este completă. Refreshing.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,Procesul de configurare este complet. Pagina se reinprospătează.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Full-mold casting,Turnare full-mucegai
DocType: Offer Letter,Select Terms and Conditions,Selectați Termeni și condiții
DocType: Email Digest,Payments made during the digest period,Plățile efectuate în timpul perioadei de rezumat
@@ -206,11 +206,11 @@
DocType: Purchase Taxes and Charges,Valuation,Evaluare
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Setat ca implicit
,Purchase Order Trends,Comandă de aprovizionare Tendințe
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Aloca concedii pentru acest an.
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Alocaţi concedii anuale.
DocType: Earning Type,Earning Type,Tip Câștig Salarial
DocType: Email Digest,New Sales Orders,Noi comenzi de vânzări
-DocType: Bank Reconciliation,Bank Account,Cont Bancar
-DocType: Leave Type,Allow Negative Balance,Permite Sold Negativ
+DocType: Bank Reconciliation,Bank Account,Cont bancar
+DocType: Leave Type,Allow Negative Balance,Permiteţi sold negativ
DocType: Email Digest,Receivable / Payable account will be identified based on the field Master Type,De încasat de cont / de plătit vor fi identificate pe baza teren de Master Tip
DocType: Selling Settings,Default Territory,Teritoriu Implicit
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Television,Televiziune
@@ -224,11 +224,11 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,Pentru Depozit este necesar înainte de Inregistrare
DocType: Sales Partner,Reseller,Reseller
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,Va rugam sa introduceti de companie
-DocType: Delivery Note Item,Against Sales Invoice Item,Împotriva Vânzări factură Postul
+DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
,Production Orders in Progress,Comenzile de producție în curs de desfășurare
-DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,Auto-raise Cerere Stivuitoare dacă cantitate ajungând sub nivelul re-comandă în depozit implicit
+DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,Crează în mod automat cerere de material dacă cantitatea ajunge sub nivelul de re-comandă în depozitul implicit
DocType: Journal Entry,Write Off Amount <=,Scrie Off Suma <=
-DocType: Lead,Address & Contact,Adresa și Contact
+DocType: Lead,Address & Contact,Adresă și contact
apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,Creare Inregistrari in Registru Contabil de Stoc atunci când inregistrezi o Factură de Vanzare
DocType: Newsletter List,Total Subscribers,Abonații totale
@@ -238,7 +238,7 @@
apps/erpnext/erpnext/templates/generators/item.html +21,No description given,Nici o descriere dat
apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Cere pentru cumpărare.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Double housing,Locuințe dublu
-DocType: Item,"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unitatea de măsură a acestui articol (de exemplu, Kg, Unitatea, Nu, pereche)."
+DocType: Item,"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unitatea de măsură a acestui articol (de ex., kg, unitate, nr, pereche)."
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +167,Leaves per Year,Frunze pe an
@@ -279,9 +279,9 @@
DocType: Lead,Suggestions,Sugestii
DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set bugetelor Grupa înțelept Articol de pe acest teritoriu. Puteți include, de asemenea, sezonier prin setarea distribuție."
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Va rugam sa introduceti grup considerare mamă pentru depozit {0}
-DocType: Supplier,Address HTML,Adresa HTML
+DocType: Supplier,Address HTML,Adresă HTML
DocType: Lead,Mobile No.,Mobil Nu.
-DocType: Maintenance Schedule,Generate Schedule,Genereaza Orar
+DocType: Maintenance Schedule,Generate Schedule,Generează orar
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Hubbing,Hubbing
DocType: Purchase Invoice Item,Expense Head,Beneficiar Cheltuiala
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vă rugăm să selectați tipul de taxă în primul rând
@@ -303,10 +303,10 @@
DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Adauga / Editeaza </ a>"
DocType: Employee,External Work History,Istoricul lucrului externă
apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Eroare de referință Circular
-DocType: ToDo,Closed,Inchis
+DocType: ToDo,Closed,Închis
DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,În cuvinte (de export) va fi vizibil după ce a salva de livrare Nota.
DocType: Lead,Industry,Industrie
-DocType: Employee,Job Profile,Profil Loc de Muncă
+DocType: Employee,Job Profile,Profilul postului
DocType: Newsletter,Newsletter,Newsletter
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Hydroforming,Hidroformare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Necking,Necking
@@ -316,27 +316,27 @@
DocType: Comment,System Manager,System Manager
DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
DocType: Sales Invoice Item,Delivery Note,Nota de Livrare
-DocType: Backup Manager,Allow Dropbox Access,Permite Accesul Dropbox
+DocType: Backup Manager,Allow Dropbox Access,Permiteţi accesul Dropbox
DocType: Communication,Support Manager,Suport Manager de
DocType: Sales Order Item,Reserved Warehouse,Rezervat Warehouse
apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} a intrat de două ori în postul fiscal
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
DocType: Workstation,Rent Cost,Chirie Cost
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vă rugăm selectați luna și anul
DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduceți ID-uri de email separate prin virgule, factura va fi trimisa prin email automat la o anumită dată"
DocType: Employee,Company Email,E-mail Companie
DocType: Workflow State,Refresh,Actualizare
-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.","Toate campurile legate de import, cum ar fi moneda, rata de conversie, export total, export total general etc. sunt disponibile în Chitanta de Cumparare, Cotatia Furnizorului, Factura Cumparare , Ordinul de Cumparare, etc"
+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.","Toate câmpurile legate de import, cum ar fi moneda, rata de conversie, import total, import total general etc. sunt disponibile în chitanță de cumpărare, cotație furnizor, factură de cumpărare, comandă de cumpărare, etc"
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,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +59,Total Order Considered,Comanda total Considerat
DocType: Sales Invoice Item,Discount (%),Reducere (%)
apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
apps/erpnext/erpnext/controllers/recurring_document.py +198,Please enter 'Repeat on Day of Month' field value,"Va rugam sa introduceti ""Repeat la zi a lunii"" valoare de câmp"
DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibil în FDM, Nota de Livrare, Factura de Cumparare, Ordin de Producție, Ordin de Cumparare, Chitanta de Cumparare, Factura de Vanzare, Ordin de Vanzare, Intrare de Stoc, Pontaj"
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibil în BOM, nota de livrare, factura de cumparare, comanda de producție, comanda de cumparare, chitanţa de cumpărare, factura de vânzare,comanda de vânzare, intrare de stoc, pontaj"
DocType: Item Tax,Tax Rate,Cota de impozitare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Selectați Articol
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} statut este oprit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Selectați articol
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} este în starea Oprit
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
Stock Reconciliation, instead use Stock Entry","Postul: {0} în șarje, nu pot fi reconciliate cu ajutorul \
stoc reconciliere, utilizați în schimb stoc intrare gestionate"
@@ -346,7 +346,7 @@
DocType: Stock UOM Replace Utility,Current Stock UOM,Stoc Curent UOM
apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotul (lot) unui articol.
DocType: C-Form Invoice Detail,Invoice Date,Data facturii
-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'","Deoarece există tranzacții bursiere existente pentru acest articol, nu puteți modifica valorile ""nu are nici o Serial"", ""are Lot nr"", ""Este Piesa"" și ""Metoda de evaluare"""
+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'","Deoarece există tranzacții de stoc existente aferent acestui articol, nu puteți modifica valorile 'are nr. de serie', 'are nr de lot', 'este articol de stoc' și 'metoda de evaluare'"
apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,Adresa dvs. de e-mail
DocType: Email Digest,Income booked for the digest period,Venituri rezervat pentru perioada Digest
apps/erpnext/erpnext/config/setup.py +106,Supplier master.,Furnizor maestru.
@@ -364,9 +364,9 @@
,Schedule Date,Program Data
DocType: Packed Item,Packed Item,Articol ambalate
apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Setări implicite pentru tranzacțiilor de achizitie.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Există activitate Costul Angajat {0} împotriva Activitate Tip - {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Există cost activitate pentru angajatul {0} comparativ tipului de activitate - {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.,Vă rugăm să nu creeze conturi pentru clienți și furnizori. Ele sunt create direct de la masterat Client / furnizor.
-DocType: Currency Exchange,Currency Exchange,Schimb Valutar
+DocType: Currency Exchange,Currency Exchange,Schimb valutar
DocType: Purchase Invoice Item,Item Name,Denumire Articol
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balanța de credit
DocType: Employee,Widowed,Văduvit
@@ -380,7 +380,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,Va rugam sa introduceti Primirea de cumparare Nu pentru a continua
DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
DocType: Workstation,Consumable Cost,Cost Consumabile
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să aibă rolul ""Leave aprobator"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Motiv pentru a pierde
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Tub ciubuc
@@ -391,7 +391,7 @@
DocType: Purchase Invoice,Yearly,Anual
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +217,Please enter Cost Center,Va rugam sa introduceti Cost Center
DocType: Sales Invoice Item,Sales Order,Comandă de vânzări
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Poz. Vanzarea Rata
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Rată de vânzare medie
DocType: Purchase Order,Start date of current order's period,Data perioadei ordin curent Lansați
apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},Cantitatea nu poate fi o fracțiune în rând {0}
DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
@@ -402,9 +402,9 @@
DocType: Account,Is Group,Is Group
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Termoformare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Tăiere
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Pana la Situatia Nr.' nu poate fi mai mică decât 'De la Situatia Nr.'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Până la situația nr.' nu poate fi mai mică decât 'De la situația nr.'
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,Nu început
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Neînceput
DocType: Lead,Channel Partner,Partner Canal
DocType: Account,Old Parent,Vechi mamă
DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Particulariza textul introductiv, care merge ca o parte din acel email. Fiecare tranzacție are un text introductiv separat."
@@ -416,7 +416,7 @@
apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestru de vacanta.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Shell molding,Shell laminat
DocType: Material Request Item,Required Date,Date necesare
-DocType: Delivery Note,Billing Address,Adresa de Facturare
+DocType: Delivery Note,Billing Address,Adresa de facturare
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
DocType: BOM,Costing,Cost
DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","In cazul in care se bifeaza, suma taxelor va fi considerată ca fiind deja inclusa în Rata de Imprimare / Suma de Imprimare"
@@ -428,18 +428,18 @@
DocType: Features Setup,Imports,Importurile
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,Lipire
DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de participare.
-DocType: Bank Reconciliation,Journal Entries,Intrari in Jurnal
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de prezenţă.
+DocType: Bank Reconciliation,Journal Entries,Intrari în jurnal
DocType: Sales Order Item,Used for Production Plan,Folosit pentru Planul de producție
-DocType: System Settings,Loading...,Încărcare...
+DocType: System Settings,Loading...,Se încarcă...
DocType: DocField,Password,Parolă
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Fused deposition modeling,Modelare depunere condensat
DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între operațiuni (în minute)
-DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.","Notă: Backup și fișierele nu sunt șterse de pe Google Drive, va trebui să le ștergeți manual."
-DocType: Customer,Buyer of Goods and Services.,Cumpărător a produselor și serviciilor.
+DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.","Notă: Backup-ul și fișierele nu sunt șterse de pe Google Drive, va trebui să le ștergeți manual."
+DocType: Customer,Buyer of Goods and Services.,Cumpărător de produse și servicii.
DocType: Journal Entry,Accounts Payable,Conturi de plată
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adauga Abonații
-sites/assets/js/erpnext.min.js +2,""" does not exists","""Nu există"
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adăugaţi Abonați
+sites/assets/js/erpnext.min.js +2,""" does not exists",""" nu există"
DocType: Pricing Rule,Valid Upto,Valid Până la
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
DocType: Email Digest,Open Tickets,Bilete deschise
@@ -447,12 +447,12 @@
DocType: Email Digest,Total amount of invoices received from suppliers during the digest period,Suma totală a facturilor primite de la furnizori în timpul perioadei Digest
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
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.,Timpul in Zile Conducere este numărul de zile in care acest articol este așteptat în depozit. Aceaste zile sunt preluate în Cerere Material atunci când selectați acest articol.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Administrative Officer,Ofițer Administrativ
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Administrative Officer,Ofițer administrativ
DocType: Payment Tool,Received Or Paid,Primite sau plătite
DocType: Item,"Select ""Yes"" if this item is used for some internal purpose in your company.","Selectați ""Da"" în cazul în care acest element este folosit pentru un scop intern în compania dumneavoastră."
DocType: Stock Entry,Difference Account,Diferența de Cont
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +307,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
-DocType: Production Order,Additional Operating Cost,Alte costuri de operare
+DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Cosmetics,Cosmetică
DocType: DocField,Type,Tip
apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
@@ -475,15 +475,14 @@
DocType: Selling Settings,Default Customer Group,Group Client Implicit
DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Dacă este dezactivat, câmpul 'Total Rotunjit' nu va fi vizibil in nici o tranzacție"
DocType: BOM,Operating Cost,Costul de operare
-,Gross Profit,Profit Brut
+,Gross Profit,Profit brut
DocType: Production Planning Tool,Material Requirement,Cerința de material
DocType: Company,Delete Company Transactions,Ștergeți Tranzacții Company
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,Articolul {0} nu este Articol de Cumparare
apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
- Email Address'","{0} este o adresă de e-mail nevalidă în ""Notificare \
- Adresa de email"""
+ Email Address'","{0} este o adresă de email invalidă în ""Notificare \ Adrese de email"""
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adauga / Editeaza Taxe și Cheltuieli
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
DocType: Territory,For reference,Pentru referință
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),De închidere (Cr)
@@ -499,9 +498,7 @@
DocType: Buying Settings,Purchase Receipt Required,Cumpărare de primire Obligatoriu
DocType: Monthly Distribution,"**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**","** Distributie lunar ** vă ajută să vă distribuiți bugetul pe luni, dacă aveți de sezonalitate în afacerea dumneavoastră.
-
- Pentru a distribui un buget folosind această distribuție, setați acest Distributie lunar ** ** ** în centrul de cost **"
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuție lunară** vă ajută să vă distribuiți bugetul pe luni, dacă aveți sezonalitate în afacerea dvs. Pentru a distribui un buget folosind această distribuție, configurați această **distribuție lunară** în **centrul de cost**"
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
apps/erpnext/erpnext/config/accounts.py +79,Financial / accounting year.,An financiar / contabil.
@@ -510,7 +507,7 @@
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,Realizeaza Comandă de Vânzări
DocType: Project Task,Project Task,Proiect Sarcina
,Lead Id,Id Conducere
-DocType: C-Form Invoice Detail,Grand Total,Total General
+DocType: C-Form Invoice Detail,Grand Total,Total general
DocType: About Us Settings,Website Manager,Site-ul Manager de
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anul fiscal Data începerii nu trebuie să fie mai mare decât anul fiscal Data de încheiere
DocType: Warranty Claim,Resolution,Rezolutie
@@ -518,7 +515,7 @@
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +67,Payable Account,Contul furnizori
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
DocType: Backup Manager,Sync with Google Drive,Sincronizare cu Google Drive
-DocType: Leave Control Panel,Allocate,Alocare
+DocType: Leave Control Panel,Allocate,Alocaţi
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Precedenta
DocType: Stock Entry,Sales Return,Vânzări de returnare
DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selectați comenzi de vânzări de la care doriți să creați comenzi de producție.
@@ -528,10 +525,10 @@
DocType: Quotation,Quotation To,Citat Pentru a
DocType: Lead,Middle Income,Venituri medii
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/accounts/utils.py +186,Allocated amount can not be negative,Suma alocată nu poate fi negativa
+apps/erpnext/erpnext/accounts/utils.py +186,Allocated amount can not be negative,Suma alocată nu poate fi negativă
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Tumbling,Tumbling
-DocType: Purchase Order Item,Billed Amt,Facturate Amt
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări stoc.
+DocType: Purchase Order Item,Billed Amt,Suma facturată
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
DocType: Event,Wednesday,Miercuri
DocType: Sales Invoice,Customer's Vendor,Vanzator Client
@@ -543,7 +540,7 @@
DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
DocType: Packing Slip Item,DN Detail,Detaliu DN
DocType: Time Log,Billed,Facturat
-DocType: Batch,Batch Description,Lot Descriere
+DocType: Batch,Batch Description,Descriere lot
DocType: Delivery Note,Time at which items were delivered from warehouse,Timp în care obiectele au fost livrate de la depozit
DocType: Sales Invoice,Sales Taxes and Charges,Taxele de vânzări și Taxe
DocType: Employee,Organization Profile,Organizație de profil
@@ -552,7 +549,7 @@
DocType: Employee,Reason for Resignation,Motiv pentru demisie
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Șablon pentru evaluările de performanță.
DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Jurnalul Detalii intrare
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},"{0} {1} ""nu este în anul fiscal {2}"
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nu există în anul fiscal {2}
DocType: Buying Settings,Settings for Buying Module,Setări pentru cumparare Modulul
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Va rugam sa introduceti Primirea achiziția
DocType: Buying Settings,Supplier Naming By,Furnizor de denumire prin
@@ -564,7 +561,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,Din Chitanta de Cumparare
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
DocType: SMS Settings,Receiver Parameter,Receptor Parametru
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'grupat pe' nu pot fi identice
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'Grupat dupa' nu pot fi identice
DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
sites/assets/js/form.min.js +253,To,Până la data
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,Introduceți adresa de e-mail
@@ -581,32 +578,32 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Publishing,Editare
DocType: Activity Cost,Projects User,Proiecte de utilizare
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în factură Detalii masă
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
DocType: Material Request,Material Transfer,Transfer de material
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Deschidere (Dr)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Posting timestamp must be after {0},Timestamp postarea trebuie să fie după {0}
apps/frappe/frappe/config/setup.py +59,Settings,Setări
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impozite cost debarcate și Taxe
-DocType: Production Order Operation,Actual Start Time,Actual Ora de începere
+DocType: Production Order Operation,Actual Start Time,Timpul efectiv de începere
DocType: BOM Operation,Operation Time,Funcționare Ora
sites/assets/js/list.min.js +5,More,Mai mult
DocType: Communication,Sales Manager,Director De Vânzări
sites/assets/js/desk.min.js +555,Rename,Redenumire
DocType: Purchase Invoice,Write Off Amount,Scrie Off Suma
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Bending,Îndoire
-DocType: Leave Block List Allow,Allow User,Permite utilizator
-DocType: Journal Entry,Bill No,Nr. Factutra
+DocType: Leave Block List Allow,Allow User,Permiteţi utilizator
+DocType: Journal Entry,Bill No,Factură nr.
DocType: Purchase Invoice,Quarterly,Trimestrial
DocType: Selling Settings,Delivery Note Required,Nota de Livrare Necesara
-DocType: Sales Order Item,Basic Rate (Company Currency),Rata de bază (Valuta Companiei)
+DocType: Sales Order Item,Basic Rate (Company Currency),Rată elementară (moneda companiei)
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,Va rugam sa introduceti detalii element
DocType: Purchase Receipt,Other Details,Alte detalii
DocType: Account,Accounts,Conturi
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,Forfecare drept
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.,"Pentru a urmări element în vânzări și a documentelor de achiziție, pe baza lor de serie nr. Acest lucru se poate, de asemenea, utilizat pentru a urmări detalii de garanție ale produsului."
-DocType: Purchase Receipt Item Supplied,Current Stock,Stoc Curent
+DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
DocType: Employee,Provide email id registered in company,Furnizarea id-ul de e-mail înregistrată în societate
@@ -620,25 +617,25 @@
DocType: Serial No,Warranty Expiry Date,Garanție Data expirării
DocType: Material Request Item,Quantity and Warehouse,Cantitatea și Warehouse
DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
-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","Împotriva Voucher Tipul trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal intrare"
-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,Spatiul Aerian
+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","Comparativ tipului de voucher trebuie să fie o opțiune dintre următoarele: ordin de vânzări, factură de vânzări sau intrare în jurnal"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Biomachining,Bioprelucrare
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Aerospace,Spaţiul aerian
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bine ați venit
DocType: Journal Entry,Credit Card Entry,Card de credit intrare
apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Sarcina Subiect
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Bunuri primite de la Furnizori.
+apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Bunuri primite de la furnizori.
DocType: Communication,Open,Deschide
-DocType: Lead,Campaign Name,Nume Campanie
+DocType: Lead,Campaign Name,Denumire campanie
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +197,Please enter Delivery Note No or Sales Invoice No to proceed,Va rugam sa introduceti de livrare Notă Nu sau Factura Vanzare Nu pentru a continua
,Reserved,Rezervat
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you really want to UNSTOP, Doriti intr-adevar sa NU VA OPRITI
DocType: Purchase Order,Supply Raw Materials,Aprovizionarea cu materii prime
DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Active Curente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} nu este un articol de stoc
DocType: Mode of Payment Account,Default Account,Cont Implicit
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
-DocType: Contact Us Settings,Address Title,Titlu Adresa
+DocType: Contact Us Settings,Address Title,Titlu adresă
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +32,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
DocType: Production Order Operation,Planned End Time,Planificate End Time
,Sales Person Target Variance Item Group-Wise,Persoana de vânzări țintă varianță Articol Grupa Înțelept
@@ -656,10 +653,10 @@
Până Suma este {2}"
DocType: Item Group,Website Specifications,Site-ul Specificații
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,New Account,Cont nou
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: De la {0} din {1} tip
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
apps/erpnext/erpnext/templates/pages/ticket.py +27,Please write something,Vă rugăm să scrie ceva
-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.,Intrările contabile pot fi făcute împotriva noduri frunză. Intrări împotriva grupurilor nu sunt permise.
+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.,Intrările contabile pot fi create comparativ nodurilor frunză. Intrările comparativ grupurilor nu sunt permise.
DocType: ToDo,High,Ridicat
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +364,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
DocType: Opportunity,Maintenance,Mentenanţă
@@ -707,7 +704,7 @@
8. Introduceți Row: Dacă bazat pe ""Înapoi Row Total"", puteți selecta numărul rând care vor fi luate ca bază pentru acest calcul (implicit este rândul precedent).
9. Este Brut inclus în rata de bază ?: Dacă verifica acest lucru, înseamnă că acest impozit nu va fi arătată tabelul de mai jos articol, dar vor fi incluse în rata de bază din tabelul punctul principal. Acest lucru este util în cazul în care doriți dau un preț plat (cu toate taxele incluse) preț pentru clienți."
DocType: Serial No,Purchase Returned,Cumpărare returnate
-DocType: Employee,Bank A/C No.,Banca A/C Nr.
+DocType: Employee,Bank A/C No.,Bancă A/C nr.
DocType: Email Digest,Scheduler Failed Events,Evenimente planificator nereușite
DocType: Expense Claim,Project,Proiectarea
DocType: Quality Inspection Reading,Reading 7,Lectură 7
@@ -729,33 +726,33 @@
DocType: Company,Default Bank Account,Cont Bancar Implicit
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,Nos
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu Reconciliere Bancara
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,Facturi mele
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,Facturile mele
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nu a fost gasit angajat
DocType: Purchase Order,Stopped,Oprita
-DocType: SMS Center,All Customer Contact,Toti Clienți de Contact
+DocType: SMS Center,All Customer Contact,Toate contactele clienților
apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Încărcați echilibru stoc prin csv.
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +32,Send Now,Trimite Acum
,Support Analytics,Suport Analytics
DocType: Item,Website Warehouse,Site-ul Warehouse
DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Scorul trebuie să fie mai mică sau egală cu 5
-apps/erpnext/erpnext/config/accounts.py +159,C-Form records,Înregistrări Forma-C
+apps/erpnext/erpnext/config/accounts.py +159,C-Form records,Înregistrări formular-C
DocType: Email Digest,Email Digest Settings,Setari Email Digest
apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Interogări de suport din partea clienților.
DocType: Bin,Moving Average Rate,Rata medie mobilă
DocType: Production Planning Tool,Select Items,Selectați Elemente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} împotriva lui Bill {1} din {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
DocType: Communication,Reference Name,Nume de referință
DocType: Maintenance Visit,Completion Status,Stare Finalizare
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","Pentru a urmări nume de marcă în următoarele documente nota de livrare, oportunitate, cerere Material, Item, Ordinul de cumparare, cumparare Voucherul, Cumpărătorul Primirea, cotatie, Factura Vanzare, Vanzari BOM, comandă de vânzări, Serial nr"
DocType: Production Order,Target Warehouse,Țintă Warehouse
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Vanzare
DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Toate Grupurile de Articole
-DocType: Salary Manager,Activity Log,Jurnal Activitati
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
+DocType: Salary Manager,Activity Log,Jurnal Activitate
apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Profit / pierdere net
-apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj pe prezentarea de tranzacții.
+apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
DocType: Production Order,Item To Manufacture,Articol pentru Fabricare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,Turnare mucegai permanent
DocType: Sales Order Item,Projected Qty,Proiectat Cantitate
@@ -766,7 +763,7 @@
,Purchase Receipt Trends,Tendințe Primirea de cumpărare
DocType: Appraisal,Select template from which you want to get the Goals,Selectați șablonul din care doriți să obțineți Obiectivelor
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Research & Development,Cercetare & Dezvoltare
-,Amount to Bill,Suma care va fi Facturata
+,Amount to Bill,Sumă pentru facturare
DocType: Company,Registration Details,Detalii de înregistrare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,Staking
DocType: Item Reorder,Re-Order Qty,Re-comanda Cantitate
@@ -778,17 +775,17 @@
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +636,Make Maint. Visit,Realizeaza Vizita de Mente.
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +68,Cannot carry forward {0},Nu se poate duce mai departe {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'","Soldul contului este deja în Credit, nu poţi seta ""Balanța trebuie să fie"" drept ""Debit""."
-DocType: Account,Balance must be,Bilantul trebuie să fie
+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'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
+DocType: Account,Balance must be,Bilanţul trebuie să fie
DocType: Hub Settings,Publish Pricing,Publica Prețuri
DocType: Email Digest,New Purchase Receipts,Noi Încasări de cumpărare
DocType: Notification Control,Expense Claim Rejected Message,Mesaj Respingere Revendicare Cheltuieli
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Nailing,Cuie
-,Available Qty,Disponibil Cantitate
+,Available Qty,Cantitate disponibilă
DocType: Purchase Taxes and Charges,On Previous Row Total,Inapoi la rândul Total
DocType: Salary Slip,Working Days,Zile lucratoare
DocType: Serial No,Incoming Rate,Rate de intrare
-DocType: Packing Slip,Gross Weight,Greutate Bruta
+DocType: Packing Slip,Gross Weight,Greutate brută
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +409,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
DocType: HR Settings,Include holidays in Total no. of Working Days,Includ vacanțe în total nr. de zile lucrătoare
DocType: Job Applicant,Hold,Păstrarea / Ţinerea / Deţinerea
@@ -815,7 +812,7 @@
DocType: Bank Reconciliation,Total Amount,Suma totală
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Internet Publishing,Editura Internet
DocType: Production Planning Tool,Production Orders,Comenzi de producție
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,Valoarea Bilantului
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,Valoarea bilanţului
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publica pentru a sincroniza articole
DocType: Purchase Receipt,Range,Interval
@@ -831,8 +828,8 @@
DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Contul Bancar / de Numerar implicit va fi actualizat automat în Factura POS atunci când acest mod este selectat.
DocType: Employee,Permanent Address Is,Adresa permanentă este
DocType: Production Order Operation,Operation completed for how many finished goods?,Funcționare completat de cât de multe bunuri finite?
-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}.,Reduceri pentru mai mult de-{0} a trecut pentru postul {1}.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,Marca
+apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
DocType: Employee,Exit Interview Details,Detalii Interviu de Iesire
DocType: Item,Is Purchase Item,Este de cumparare Articol
DocType: Payment Reconciliation Payment,Purchase Invoice,Factura de cumpărare
@@ -840,26 +837,26 @@
DocType: Stock Entry,Total Outgoing Value,Valoarea totală de ieșire
DocType: Lead,Request for Information,Cerere de informații
DocType: Payment Tool,Paid,Plătit
-DocType: Salary Slip,Total in words,Totală în cuvinte
+DocType: Salary Slip,Total in words,Total în cuvinte
DocType: Material Request Item,Lead Time Date,Data Timp Conducere
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +127,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Transporturile către clienți.
DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Venituri indirecte
-DocType: Contact Us Settings,Address Line 1,Adresa Linia 1
+DocType: Contact Us Settings,Address Line 1,Adresă Linie 1
apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variație
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +390,Company Name,Denumire Companie
-DocType: SMS Center,Total Message(s),Total de mesaje (e)
+DocType: SMS Center,Total Message(s),Total mesaj(e)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +508,Select Item for Transfer,Selectați Element de Transfer
DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Selectați contul șef al băncii, unde de verificare a fost depus."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permite utilizatorului să editeze Lista Ratelor Preturilor în tranzacții
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permiteţi utilizatorului să editeze lista ratelor preturilor din tranzacții
DocType: Pricing Rule,Max Qty,Max Cantitate
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,Chimic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Toate elementele au fost deja transferate pentru această Comandă de Producție.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
DocType: Salary Manager,Select Payroll Year and Month,Selectați Salarizare anul și luna
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""","Du-te la grupul corespunzător (de obicei, de aplicare fondurilor> Active curente> Conturi bancare și de a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip "Banca""
-DocType: Workstation,Electricity Cost,Cost energie electrica
+DocType: Workstation,Electricity Cost,Cost energie electrică
DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Memento pentru Zi de Nastere Angajat
DocType: Comment,Unsubscribed,Nesubscrise
DocType: Opportunity,Walk In,Walk In
@@ -867,13 +864,13 @@
apps/erpnext/erpnext/config/accounts.py +96,Tree of finanial Cost Centers.,Arborele de centre de cost finanial.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +472,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,White,Alb
-DocType: SMS Center,All Lead (Open),Toate Produsele de Top (Deschise)
+DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Picture,Atașați imaginea
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Picture,Atașați imaginea dvs.
DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
DocType: Workflow State,Stop,Oprire
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.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă.
-DocType: Purchase Order,% of materials billed against this Purchase Order.,% din materialele facturate comparativ cu acest Ordin de Plata
+DocType: Purchase Order,% of materials billed against this Purchase Order.,% din materialele facturate comparativ cu această comanda de cumparare
apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
DocType: Lead,Next Contact Date,Următor Contact Data
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +34,Opening Qty,Deschiderea Cantitate
@@ -884,7 +881,7 @@
DocType: Leave Application,Leave Application,Aplicatie pentru Concediu
apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Mijloc pentru Alocare Concediu
DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
-DocType: Email Digest,Buying & Selling,Cumparare si vânzare
+DocType: Email Digest,Buying & Selling,Cumpărare şi vânzare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Trimming,Aranjare
DocType: Workstation,Net Hour Rate,Net Rata de ore
DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chitanta de Cumparare aferent Costului Final
@@ -892,7 +889,7 @@
DocType: POS Setting,Cash/Bank Account,Numerar/Cont Bancar
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
DocType: Delivery Note,Delivery To,De Livrare la
-DocType: Production Planning Tool,Get Sales Orders,Obtine Comenzi de Vânzări
+DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nu poate fi negativ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,"Row {0}: Party / Account does not match with \
Customer / Debit To in {1}","Rând {0}: Party / cont nu se potrivește cu \
@@ -913,13 +910,7 @@
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 Sales BOM Item.
-Note: BOM = Bill of Materials","Grup agregat de articole ** ** într-o altă Postul ** **. Acest lucru este util dacă gruparea de anumite articole ** ** într-un pachet și să mențină un bilanț al ambalate ** ** Elemente și nu agregatului ** Postul **.
-
- Pachetul ** ** Postul va avea ""Este Piesa"" ca ""Nu"" și ""Este punctul de vânzare"" ca ""Da"".
-
- De exemplu: Dacă sunt de vânzare Laptop-uri și Rucsacuri separat și au un preț special în cazul în care clientul cumpără atât, atunci laptop + Rucsac va fi un nou Sales BOM Postul.
-
- Notă: BOM = Bill de materiale"
+Note: BOM = Bill of Materials","Comasați grupul de **articole** într-un alt **articol**. Acest lucru este util dacă grupați anumite **articole** într-un pachet și mențineți stocul **articolelor**ambalate și nu pe cel al **articolelor** comasate. **Articolul** ambalat va avea valoarea ""Nu"" pentru ""Este articol de stoc"" și valoarea ""Da"" pentru ""Este articol de vânzări"". De exemplu: Dacă vindeți Laptopuri și Rucsacuri separat și au un preț special în cazul în care clientul le cumpără pe ambele, atunci laptop + rucsac va fi un nou articol de vanzări BOM. Notă: BOM = Factură de materiale"
DocType: Item,Manufacturer,Producător
DocType: Landed Cost Item,Purchase Receipt Item,Primirea de cumpărare Postul
DocType: Sales Order,PO Date,PO Data
@@ -930,7 +921,7 @@
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,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
DocType: Serial No,Creation Document No,Creare Document Nr.
DocType: Issue,Issue,Problem
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribute pentru postul variante. de exemplu, dimensiunea, culoarea etc."
+apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu dimensiune, culoare etc."
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +30,WIP Warehouse,WIP Depozit
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
DocType: BOM Operation,Operation,Operație
@@ -939,7 +930,7 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Cheltuieli de vânzare
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,Cumpararea Standard
-DocType: GL Entry,Against,Împotriva
+DocType: GL Entry,Against,Comparativ
DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
DocType: Purchase Invoice,Contact Info,Informaţii Persoana de Contact
@@ -955,27 +946,27 @@
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","Articolul trebuie să fie un articol de cumpărare, așa cum este prezent în unul sau mai multe FDM Active"
apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
-DocType: Journal Entry Account,Against Purchase Invoice,Împotriva Facturii de Cumparare
+DocType: Journal Entry Account,Against Purchase Invoice,Comparativ facturii de cumpărare
apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Pentru a {0} | {1} {2}
DocType: Time Log Batch,updated via Time Logs,actualizat prin timp Busteni
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vârsta medie
-apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,Du-te și se adaugă ceva la cos.
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vârstă medie
+apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,Du-te și adaugă ceva in cos.
DocType: Opportunity,Your sales person who will contact the customer in future,Persoana de vânzări care va contacta clientul în viitor
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +537,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
DocType: Supplier,Default Currency,Monedă implicită
DocType: Contact,Enter designation of this Contact,Introduceți destinatia acestui Contact
DocType: Contact Us Settings,Address,Adresă
DocType: Expense Claim,From Employee,Din Angajat
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} nu într-un an fiscal. Pentru mai multe detalii verifica {2}.
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} nu există nici într-un an fiscal. Pentru mai multe detalii verificați {2}.
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta
-DocType: Upload Attendance,Attendance From Date,Participarea la data
+DocType: Upload Attendance,Attendance From Date,Prezenţa del la data
DocType: Appraisal Template Goal,Key Performance Area,Domeniu de Performanță Cheie
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,Transport
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} trebuie să fie prezentate
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
DocType: SMS Center,Total Characters,Total de caractere
apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalii Factura Forma-C
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detaliu factură formular-C
DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconcilierea plata facturii
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuția%
DocType: Item,website page link,pagina site-ului link-ul
@@ -984,7 +975,7 @@
DocType: Sales Partner,Distributor,Distribuitor
DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +53,Budget cannot be set for Group Cost Centers,Bugetul nu poate fi setat pentru Centre de Grupuri de Cost
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +53,Budget cannot be set for Group Cost Centers,Bugetul nu poate fi configurat pentru centre de de cost aprţinătoare grupului
,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selectați Timp Busteni Trimite pentru a crea o nouă factură de vânzare.
DocType: Global Defaults,Global Defaults,Valori Implicite Globale
@@ -996,10 +987,10 @@
DocType: Supplier,Communications,Comunicari
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Capacitate de eroare de planificare
DocType: Lead,Consultant,Consultant
-DocType: Salary Slip,Earnings,Câștig
+DocType: Salary Slip,Earnings,Câștiguri
DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Nimic de a solicita
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de început' nu poate fi ulterioara datei 'Data efectiva de Sfarsit'
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de început' nu poate fi ulterioară datei 'Data efectivă de sfârșit'
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,Management
apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipuri de activități de fișe de pontaj
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Turnare de investiții
@@ -1010,7 +1001,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Albastru
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,Noduri suplimentare pot fi create numai în noduri de tip 'Grup'
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} nos serie valabile pentru postul {1}
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Cod articol nu pot fi schimbate pentru Serial No.
DocType: Purchase Order Item,UOM Conversion Factor,Factorul de conversie UOM
DocType: Stock Settings,Default Item Group,Group Articol Implicit
@@ -1034,12 +1025,12 @@
DocType: Event,Saturday,Sâmbătă
DocType: Leave Control Panel,Leave blank if considered for all branches,Lăsați necompletat dacă se consideră pentru toate ramurile
,Daily Time Log Summary,Rezumat Zilnic Log Timp
-DocType: DocField,Label,Eticheta
+DocType: DocField,Label,Etichetă
DocType: Payment Reconciliation,Unreconciled Payment Details,Nereconciliate Detalii de plată
DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
-DocType: Lead,Call,Apel
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,'Intrările' nu poate fi vide
+DocType: Lead,Call,Apelaţi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,'Intrările' nu pot fi vide
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
,Trial Balance,Balanta
sites/assets/js/erpnext.min.js +2,"Grid ""","Grid """
@@ -1051,12 +1042,12 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vezi Ledger
DocType: Cost Center,Lft,LFT
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-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","Există un grup de articole cu același nume, vă rugăm să schimbați numele articolului sau redenumiti grupul de articole"
+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","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
DocType: Sales Order,Delivery Status,Starea de Livrare
DocType: Production Order,Manufacture against Sales Order,Fabricarea de comandă de vânzări
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,Restul lumii
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
-,Budget Variance Report,Raport Variatie Buget
+,Budget Variance Report,Raport de variaţie buget
DocType: Salary Slip,Gross Pay,Plata Bruta
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendele plătite
DocType: Stock Reconciliation,Difference Amount,Diferența Suma
@@ -1067,27 +1058,27 @@
DocType: Purchase Invoice,Is Recurring,Este recurent
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,Direct metal laser sintering,Metalice directă sinterizare cu laser
DocType: Purchase Order,Supplied Items,Articole furnizate
-DocType: Production Order,Qty To Manufacture,Cantitate pentru fabricarea
+DocType: Production Order,Qty To Manufacture,Cantitate pentru fabricare
DocType: Buying Settings,Maintain same rate throughout purchase cycle,Menține aceeași cată in cursul ciclului de cumpărare
DocType: Opportunity Item,Opportunity Item,Oportunitate Articol
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Deschiderea temporară
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
,Employee Leave Balance,Bilant Concediu Angajat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},Bilantul pentru Contul {0} trebuie să fie întotdeauna {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
DocType: Sales Invoice,More Info,Mai multe informatii
-DocType: Address,Address Type,Tip Adresa
+DocType: Address,Address Type,Tip adresă
DocType: Purchase Receipt,Rejected Warehouse,Depozit Respins
-DocType: GL Entry,Against Voucher,Împotriva Voucherului
+DocType: GL Entry,Against Voucher,Comparativ voucherului
DocType: Item,Default Buying Cost Center,Centru de Cost Cumparare Implicit
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
-,Accounts Payable Summary,Conturi Rezumat furnizori
+,Accounts Payable Summary,Rezumat conturi pentru plăți
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
DocType: Email Digest,New Stock Entries,Stoc nou Entries
apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,Mic
-DocType: Employee,Employee Number,Numar Angajat
+DocType: Employee,Employee Number,Numar angajat
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
DocType: Material Request,% Completed,% Finalizat
,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
@@ -1106,7 +1097,7 @@
DocType: Mode of Payment,Mode of Payment,Mod de plata
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
DocType: Purchase Invoice Item,Purchase Order,Comandă de aprovizionare
-DocType: Warehouse,Warehouse Contact Info,Depozit Contact
+DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
sites/assets/js/form.min.js +180,Name is required,Este necesar numele
DocType: Purchase Invoice,Recurring Type,Tip recurent
DocType: Address,City/Town,Oras/Localitate
@@ -1121,28 +1112,28 @@
apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Production Order status is {0},Statutul de producție Ordinul este {0}
DocType: Appraisal Goal,Goal,Obiectiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,For Supplier,Pentru Furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,For Supplier,Pentru furnizor
DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setarea Tipul de cont ajută în selectarea acest cont în tranzacții.
DocType: Purchase Invoice,Grand Total (Company Currency),Total general (Valuta Companie)
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Raport de ieșire
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""","Nu poate fi doar o singură regulă Condiții presetate cu 0 sau o valoare necompletată pentru ""la valoarea"""
DocType: DocType,Transaction,Tranzacție
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Notă: Acest centru de cost este un grup. Nu pot face înregistrări contabile impotriva grupuri.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Instrumentele
+apps/erpnext/erpnext/config/projects.py +43,Tools,Instrumente
DocType: Sales Taxes and Charges Template,Valid For Territories,Valabil pentru teritoriile
DocType: Item,Website Item Groups,Site-ul Articol Grupuri
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Production order number is mandatory for stock entry purpose manufacture,Numărul de ordine Producția este obligatorie pentru intrarea stoc scop înregistrării
DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
-DocType: Applicable Territory,Applicable Territory,Teritoriul Aplicabil
+DocType: Applicable Territory,Applicable Territory,Teritoriu aplicabil
apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
-DocType: Journal Entry,Journal Entry,Intrare in Jurnal
+DocType: Journal Entry,Journal Entry,Intrare în jurnal
DocType: Workstation,Workstation Name,Stație de lucru Nume
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} nu apartine postul {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
DocType: Sales Partner,Target Distribution,Țintă Distribuție
sites/assets/js/desk.min.js +536,Comments,Comentarii
-DocType: Salary Slip,Bank Account No.,Cont Bancar Nr.
-DocType: Naming Series,This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții creat cu acest prefix
+DocType: Salary Slip,Bank Account No.,Cont bancar nr.
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții create cu acest prefix
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +167,Valuation Rate required for Item {0},Rata de evaluare necesar pentru postul {0}
DocType: Quality Inspection Reading,Reading 8,Lectură 8
DocType: Sales Partner,Agent,Agent
@@ -1155,16 +1146,16 @@
DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +169,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
sites/assets/js/form.min.js +197,No Data,No Data
-DocType: Appraisal Template Goal,Appraisal Template Goal,Model Obiectiv Expertiva
+DocType: Appraisal Template Goal,Appraisal Template Goal,Obiectiv model expertivă
DocType: Salary Slip,Earning,Câștig Salarial
-DocType: Purchase Taxes and Charges,Add or Deduct,Adăuga sau deduce
+DocType: Purchase Taxes and Charges,Add or Deduct,Adăugaţi sau deduceţi
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +75,Overlapping conditions found between:,Condiții se suprapun găsite între:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Against Journal Entry {0} is already adjusted against some other voucher,În Jurnalul intrare {0} este deja ajustate alt voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
DocType: Backup Manager,Files Folder ID,ID Dosar Fisiere
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +58,Total Order Value,Valoarea totală Comanda
apps/erpnext/erpnext/stock/doctype/item/item.py +196,Item Variants {0} deleted,Postul variante {0} eliminat
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Produse Alimentare
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama Îmbătrânirea 3
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +127,You can make a time log only against a submitted production order,Puteți face un jurnal de timp doar împotriva unui ordin de producție prezentată
DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
DocType: Cost Center,old_parent,old_parent
@@ -1175,10 +1166,10 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +99,Status updated to {0},Starea actualizat la {0}
DocType: DocField,Description,Descriere
-DocType: Authorization Rule,Average Discount,Discount Mediiu
-DocType: Backup Manager,Backup Manager,Manager de Backup
+DocType: Authorization Rule,Average Discount,Discount mediiu
+DocType: Backup Manager,Backup Manager,Manager de backup
DocType: Letter Head,Is Default,Este Implicit
-DocType: Address,Utilities,Utilities
+DocType: Address,Utilities,Utilitați
DocType: Purchase Invoice Item,Accounting,Contabilitate
DocType: Features Setup,Features Setup,Caracteristici de setare
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vezi Scrisoare Oferta
@@ -1192,16 +1183,16 @@
DocType: Item,Will also apply to variants,"Va aplică, de asemenea variante"
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.,Nu se poate schimba anul fiscal Data de începere și se termină anul fiscal Data odată ce anul fiscal este salvată.
DocType: Quotation,Shopping Cart,Cosul de cumparaturi
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Medie zilnică de ieșire
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ieșire zilnică medie
DocType: Pricing Rule,Campaign,Campanie
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"Starea de aprobare trebuie să fie ""Aprobat"" sau ""Respins"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"Statusul aprobării trebuie să fie ""Aprobat"" sau ""Respins"""
DocType: Sales Invoice,Sales BOM Help,Vânzări BOM Ajutor
DocType: Purchase Invoice,Contact Person,Persoană de contact
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date','Data de Start Anticipata' nu poate fi ulterioara datei 'Data de Finalizare Anticipata'
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date','Data de început anticipata' nu poate fi ulterioara datei 'Data de sfârșit anticipata'
DocType: Holiday List,Holidays,Concedii
DocType: Sales Order Item,Planned Quantity,Planificate Cantitate
DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol
-DocType: Supplier Quotation,Get Terms and Conditions,Obtine Termeni și condiții
+DocType: Supplier Quotation,Get Terms and Conditions,Obține termeni și condiții
DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +165,Max: {0},Max: {0}
@@ -1216,26 +1207,26 @@
DocType: Purchase Receipt Item,Discount %,Reducere %
apps/erpnext/erpnext/stock/doctype/item/item.py +473,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
DocType: Maintenance Visit,Unscheduled,Neprogramat
-DocType: Employee,Owned,Owned
+DocType: Employee,Owned,Deținut
DocType: Pricing Rule,"Higher the number, higher the priority","Este mai mare numărul, mai mare prioritate"
,Purchase Invoice Trends,Cumpărare Tendințe factură
-DocType: Employee,Better Prospects,Perspective mai Bune
+DocType: Employee,Better Prospects,Perspective îmbunătăţite
DocType: Appraisal,Goals,Obiective
DocType: Warranty Claim,Warranty / AMC Status,Garanție / AMC Starea
,Accounts Browser,Navigator Conturi
DocType: GL Entry,GL Entry,Intrari GL
DocType: HR Settings,Employee Settings,Setări Angajat
-,Batch-Wise Balance History,Istoricul Balantei Lotului-Principal
+,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
DocType: Email Digest,To Do List,To do list
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Apprentice,incepator
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Negative Quantity is not allowed,Negativ Cantitatea nu este permis
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Apprentice,Începător
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Negative Quantity is not allowed,Nu este permisă cantitate negativă
DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
Used for Taxes and Charges","Taxa detaliu tabel preluat de la maestru articol ca un șir și stocate în acest domeniu.
Folosit pentru Impozite și Taxe"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Lancing,Intepare
apps/erpnext/erpnext/hr/doctype/employee/employee.py +147,Employee cannot report to himself.,Angajat nu pot raporta la sine.
DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
-DocType: Job Opening,"Job profile, qualifications required etc.","Profil loc de muncă, calificări necesare, etc"
+DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
DocType: Journal Entry Account,Account Balance,Soldul contului
DocType: Rename Tool,Type of document to rename.,Tip de document pentru a redenumi.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +578,We buy this Item,Cumparam acest articol
@@ -1258,7 +1249,7 @@
DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Analist
DocType: Item,Inventory,Inventarierea
-DocType: Item,Sales Details,Detalii de vanzari
+DocType: Item,Sales Details,Detalii vânzări
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Pinning,Fixarea
DocType: Opportunity,With Items,Cu articole
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,In Qty,În Cantitate
@@ -1289,29 +1280,29 @@
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.","Rata de cumparare pentru articol: {0} nu a fost găsit, care este necesară pentru a face rezervarea intrare contabilitate (cheltuieli). Va rugam mentionati preț articol de o listă de prețuri de cumpărare."
DocType: Maintenance Schedule,Schedules,Orarele
DocType: Purchase Invoice Item,Net Amount,Cantitate netă
-DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu FDM Nr.
+DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
DocType: Period Closing Voucher,CoA Help,Ajutor CoA
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +533,Error: {0} > {1},Eroare: {0}> {1}
apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Vă rugăm să creați un cont nou de Planul de conturi.
DocType: Maintenance Visit,Maintenance Visit,Vizita Mentenanta
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Client Group> Teritoriul
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Lot disponibile Cantitate la Warehouse
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantitate lot disponibilă în depozit
DocType: Time Log Batch Detail,Time Log Batch Detail,Ora Log lot Detaliu
-DocType: Workflow State,Tasks,Task-uri
+DocType: Workflow State,Tasks,Sarcini
DocType: Landed Cost Voucher,Landed Cost Help,Costul Ajutor Landed
DocType: Event,Tuesday,Marți
-DocType: Leave Block List,Block Holidays on important days.,Vacanta bloc în zilele importante.
-,Accounts Receivable Summary,Conturi de încasat Rezumat
+DocType: Leave Block List,Block Holidays on important days.,Blocaţi zile de sărbătoare în zilele importante.
+,Accounts Receivable Summary,Rezumat conturi de încasare
apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
DocType: UOM,UOM Name,Numele UOM
-DocType: Top Bar Item,Target,Ţintă
+DocType: Top Bar Item,Target,Țintă
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribuția Suma
DocType: Sales Invoice,Shipping Address,Adresa de livrare
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.,Acest instrument vă ajută să actualizați sau stabili cantitatea și evaluarea stocului in sistem. Acesta este de obicei folosit pentru a sincroniza valorile de sistem și ceea ce există de fapt în depozite tale.
DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,În cuvinte va fi vizibil după ce a salva de livrare Nota.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Detinator Marca.
+apps/erpnext/erpnext/config/stock.py +120,Brand master.,Deţinător marcă.
DocType: ToDo,Due Date,Data Limita
-DocType: Sales Invoice Item,Brand Name,Nume Marca
+DocType: Sales Invoice Item,Brand Name,Denumire marcă
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Box,Cutie
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +387,The Organization,Organizația
DocType: Monthly Distribution,Monthly Distribution,Distributie lunar
@@ -1321,17 +1312,17 @@
DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Notching,Crestare
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +44,Reserved warehouse required for stock item {0},Depozit rezervat necesar pentru postul de valori {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi Bancare
-,Bank Reconciliation Statement,Extras de Cont Reconciliere Bancara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi bancare
+,Bank Reconciliation Statement,Extras de cont reconciliere bancară
DocType: Address,Lead Name,Nume Conducere
,POS,POS
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0} trebuie să apară o singură dată
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0} trebuie să apară doar o singură dată
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nu este permis să transferam mai {0} {1} decât împotriva Comandă {2}
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nu sunt produse în ambalaj
DocType: Shipping Rule Condition,From Value,Din Valoare
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +579,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +41,Amounts not reflected in bank,Nu Sumele reflectate în bancă
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +41,Amounts not reflected in bank,Sumele nu sunt corespunzătoare cu banca
DocType: Quality Inspection Reading,Reading 4,Reading 4
apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Cererile pentru cheltuieli companie.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +7,Centrifugal casting,Turnare centrifugală
@@ -1359,7 +1350,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +286,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +74,Import Successful!,Importa cu succes!
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
-DocType: Email Digest,Expenses Booked,Cheltuieli Blocate
+DocType: Email Digest,Expenses Booked,Cheltuieli rezervate
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +168,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
DocType: Quotation Item,Quotation Item,Citat Articol
DocType: Account,Account Name,Numele Contului
@@ -1380,21 +1371,21 @@
apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Taxat
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,Rezervate Cantitate
DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Rsurse Umane
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Resurse umane
DocType: Lead,Upper Income,Venituri de sus
apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,Problemele mele
-DocType: BOM Item,BOM Item,Articol FDM
+DocType: BOM Item,BOM Item,Articol BOM
DocType: Appraisal,For Employee,Pentru Angajat
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,Rând {0}: Suma de plată nu poate fi negativ
DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,Presa de montare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},Împotriva Furnizor factură {0} din {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
DocType: Party Type,Default Price List,Lista de Prețuri Implicita
DocType: Journal Entry,User Remark will be added to Auto Remark,Observație utilizator va fi adăugat la Auto Observație
DocType: Payment Reconciliation,Payments,Plăți
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Hot isostatic pressing,Izostatice la cald presare
DocType: ToDo,Medium,Medie
-DocType: Budget Detail,Budget Allocated,Bugetul Alocat
+DocType: Budget Detail,Budget Allocated,Buget alocat
,Customer Credit Balance,Balanța Clienți credit
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client necesar pentru 'Reducere Client'
apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
@@ -1402,7 +1393,7 @@
DocType: Manufacturing Settings,Capacity Planning For (Days),Planificarea capacitate de (zile)
DocType: Warranty Claim,Warranty Claim,Garanție revendicarea
,Lead Details,Detalii Conducere
-DocType: Authorization Rule,Approving User,Aprobarea utilizator
+DocType: Authorization Rule,Approving User,Aprobare utilizator
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Forging,Forjare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Plating,Placare
DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
@@ -1413,7 +1404,7 @@
DocType: Sales Invoice,Packed Items,Articole pachet
apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garantie revendicarea împotriva Serial No.
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","Înlocuiți un anumit BOM BOM în toate celelalte unde este folosit. Acesta va înlocui pe link-ul vechi BOM, actualizați costurilor și regenera ""BOM explozie articol"" de masă ca pe noi BOM"
-DocType: Shopping Cart Settings,Enable Shopping Cart,Activați Cosul de cumparaturi
+DocType: Shopping Cart Settings,Enable Shopping Cart,Activați cosul de cumparaturi
DocType: Employee,Permanent Address,Permanent Adresa
apps/erpnext/erpnext/stock/get_item_details.py +123,Item {0} must be a Service Item.,Articolul {0} trebuie să fie un Articol de Service.
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +158,Please select item code,Vă rugăm să selectați codul de articol
@@ -1435,13 +1426,13 @@
DocType: Leave Allocation,Total Leaves Allocated,Totalul Frunze alocate
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
DocType: Employee,Date Of Retirement,Data Pensionare
-DocType: Upload Attendance,Get Template,Obtine Sablon
+DocType: Upload Attendance,Get Template,Obține șablon
DocType: Address,Postal,Poștal
DocType: Email Digest,Total amount of invoices sent to the customer during the digest period,Suma totală a facturilor trimise clientului în timpul perioadei Digest
DocType: Item,Weightage,Weightage
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Mining,Minerit
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Resin casting,Turnare de rășină
-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,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau redenumiti Grupul Clienti
+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,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
DocType: Territory,Parent Territory,Teritoriul părinte
DocType: Quality Inspection Reading,Reading 2,Reading 2
DocType: Stock Entry,Material Receipt,Primirea de material
@@ -1457,12 +1448,12 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","de exemplu, ""XYZ Banca Națională """
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Raport țintă
-DocType: Job Applicant,Applicant for a Job,Solicitantul unui loc de muncă
+DocType: Job Applicant,Applicant for a Job,Solicitant pentru un loc de muncă
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +178,No Production Orders created,Nu sunt comenzile de producție create
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salariul alunecare de angajat {0} deja creat pentru această lună
DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
-DocType: Sales Invoice Item,Batch No,Lot Nr.
+DocType: Sales Invoice Item,Batch No,Lot nr.
apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Principal
DocType: DocPerm,Delete,Șterge
apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variantă
@@ -1475,7 +1466,7 @@
DocType: Sales Invoice,Considered as an Opening Balance,Considerat ca o Balanta de Deschidere
DocType: Item,Variants,Variante
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,Realizeaza Comanda de Cumparare
-DocType: SMS Center,Send To,Pentru a trimite
+DocType: SMS Center,Send To,Trimite la
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
DocType: Sales Team,Contribution to Net Total,Contribuție la Total Net
DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
@@ -1483,37 +1474,37 @@
DocType: Territory,Territory Name,Teritoriului Denumire
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitant pentru un loc de muncă.
-DocType: Sales Invoice Item,Warehouse and Reference,Depozit și de referință
+DocType: Sales Invoice Item,Warehouse and Reference,Depozit și referință
DocType: Supplier,Statutory info and other general information about your Supplier,Info statutar și alte informații generale despre dvs. de Furnizor
DocType: Country,Country,Ţară
apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,Adrese
DocType: Communication,Received,Primita
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,În Jurnalul intrare {0} nu are nici o {1} intrare de neegalat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o norma de transport
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
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","Nume de nou cont. Notă: Vă rugăm să nu creați conturi pentru clienți și furnizori, ele sunt create în mod automat de la client și furnizor maestru"
-DocType: DocField,Attach Image,Atașați Image
+DocType: DocField,Attach Image,Atașați imagine
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Greutatea netă a acestui pachet. (Calculat automat ca suma de greutate netă de produs)
DocType: Stock Reconciliation Item,Leave blank if no change,Lăsați necompletat dacă nici o schimbare
apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Timp Busteni pentru productie.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicați Depozit-înțelept reordonarea nivel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,BOM {0} trebuie să fie prezentate
-DocType: Authorization Control,Authorization Control,Controlul de autorizare
+DocType: Item,Apply Warehouse-wise Reorder Level,Aplicați nivel de reorganizare tip depozit
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+DocType: Authorization Control,Authorization Control,Control de autorizare
apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Log timp de sarcini.
-DocType: Production Order Operation,Actual Time and Cost,Timp real și cost
+DocType: Production Order Operation,Actual Time and Cost,Timp și cost efective
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},Cerere de material de maximum {0} se poate face pentru postul {1} împotriva comandă de vânzări {2}
DocType: Employee,Salutation,Salut
DocType: Offer Letter,Rejected,Respinse
DocType: Pricing Rule,Brand,Marca
DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,% Livrat
-apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,Set de articole la momemntul de vânzare.
-DocType: Sales Order Item,Actual Qty,Cant Efectiva
+apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,Set de articole în momemntul vânzării.
+DocType: Sales Order Item,Actual Qty,Cant efectivă
DocType: Quality Inspection Reading,Reading 10,Reading 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.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
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.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Associate,Asociat
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Associate,Asociaţi
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
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.","Pentru ""vanzari BOM"" obiecte, de magazie, de serie nr iar Lot nr vor fi luate în considerare de ""ambalare List"" masa. Dacă Depozit și Lot nr sunt aceleași pentru toate articolele ambalare pentru orice 'Sales BOM ""articol, aceste valori pot fi introduse în tabelul de punctul principal, valori vor fi copiate pe"" lista de ambalare ""masă."
DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
@@ -1521,7 +1512,7 @@
DocType: Packing Slip,To Package No.,La pachetul Nr
DocType: DocType,System,Sistem
DocType: Warranty Claim,Issue Date,Data emiterii
-DocType: Activity Cost,Activity Cost,Activitatea Cost
+DocType: Activity Cost,Activity Cost,Cost activitate
DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantitate Consumata
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Telecomunicații
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
@@ -1529,7 +1520,7 @@
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
DocType: Backup Manager,Never,Niciodată
,Sales Invoice Trends,Vânzări Tendințe factură
-DocType: Leave Application,Apply / Approve Leaves,Aplicați / Aprobare Frunze
+DocType: Leave Application,Apply / Approve Leaves,Aplicați / aprobaţi concedii
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 poate face referire la inregistrare numai dacă tipul de taxa este 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta'
DocType: Item,Allowance Percent,Procent Alocație
DocType: SMS Settings,Message Parameter,Parametru mesaj
@@ -1544,7 +1535,7 @@
DocType: Item,Has Variants,Are variante
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.,Clic pe butonul 'Intocmeste Factura Vanzare' pentru a crea o nouă Factură de Vânzare.
apps/erpnext/erpnext/controllers/recurring_document.py +164,Period From and Period To dates mandatory for recurring %s,Perioada de la și perioada la datele obligatorii pentru recurente% s
-DocType: Journal Entry Account,Against Expense Claim,Împotriva cheltuieli revendicarea
+DocType: Journal Entry Account,Against Expense Claim,Comparativ revendicării cheltuielilor
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Packaging and labeling,Ambalare și etichetare
DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
DocType: Sales Person,Parent Sales Person,Mamă Sales Person
@@ -1566,14 +1557,14 @@
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ramificatie Grup Articole
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
DocType: Maintenance Visit,Maintenance Time,Timp Mentenanta
-,Amount to Deliver,Sumă de livra
+,Amount to Deliver,Sumă pentru livrare
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,Un Produs sau Serviciu
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,Au fost erori.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,Atingând
DocType: Naming Series,Current Value,Valoare curenta
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},Articol Format nu poate avea valori și varaiants. Vă rugăm să eliminați de stoc la depozitul {0}
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} creat
-DocType: Journal Entry Account,Against Sales Order,Împotriva Comenzii de Vânzări
+DocType: Journal Entry Account,Against Sales Order,Comparativ comenzii de vânzări
,Serial No Status,Serial Nu Statut
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Tabelul Articolului nu poate fi vid
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,"Row {0}: To set {1} periodicity, difference between from and to date \
@@ -1593,7 +1584,7 @@
,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Red,Roșu
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +237,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
-DocType: Account,Frozen,Blocat
+DocType: Account,Frozen,Congelat
,Open Production Orders,Comenzi deschis de producție
DocType: Installation Note,Installation Time,Timp de instalare
apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,Ștergeți toate tranzacțiile de acest companie
@@ -1602,7 +1593,7 @@
DocType: Issue,Resolution Details,Rezoluția Detalii
apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Schimba UOM pentru un articol.
DocType: Quality Inspection Reading,Acceptance Criteria,Criteriile de receptie
-DocType: Item Attribute,Attribute Name,Caracteristica Nume
+DocType: Item Attribute,Attribute Name,Denumire atribut
apps/erpnext/erpnext/controllers/selling_controller.py +256,Item {0} must be Sales or Service Item in {1},Articolul {0} trebuie să fie un Articol de Vanzari sau de Service in {1}
DocType: Item Group,Show In Website,Arata pe site-ul
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +569,Group,Grup
@@ -1612,36 +1603,36 @@
apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Diagrama Gantt a tuturor sarcinilor.
DocType: Appraisal,For Employee Name,Pentru Numele Angajatului
DocType: Holiday List,Clear Table,Sterge Masa
-DocType: Features Setup,Brands,Marci
+DocType: Features Setup,Brands,Mărci
DocType: C-Form Invoice Detail,Invoice No,Factura Nu
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +497,From Purchase Order, Din Ordinul de Comanda
apps/erpnext/erpnext/accounts/party.py +139,Please select company first.,Vă rugăm să selectați prima companie.
DocType: Activity Cost,Costing Rate,Costing Rate
-DocType: Journal Entry Account,Against Journal Entry,Împotriva Jurnal intrare
+DocType: Journal Entry Account,Against Journal Entry,Comparativ intrării în jurnal
DocType: Employee,Resignation Letter Date,Scrisoare de demisie Data
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nu a fost setat
DocType: Communication,Date,Dată
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
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.,Stai bine în timp ce sistemul este în curs de instalare. Acest lucru poate dura câteva momente.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să aibă rolul ""aprobator cheltuieli"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Pereche
-DocType: Bank Reconciliation Detail,Against Account,Împotriva contului
+DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
DocType: Maintenance Schedule Detail,Actual Date,Data efectiva
DocType: Item,Has Batch No,Are nr. de Lot
-DocType: Delivery Note,Excise Page Number,Numărul de Pagina Accize
+DocType: Delivery Note,Excise Page Number,Numărul paginii accize
DocType: Employee,Personal Details,Detalii personale
,Maintenance Schedules,Program Mentenanta
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Embossing,Ștanțare
,Quotation Trends,Cotație Tendințe
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.","Ca producție Ordine pot fi făcute pentru acest articol, trebuie să fie un element de stoc."
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.","Deoarece se poate întocmi ordin de producție aferent acestui articol, acesta trebuie să fie un articol de stoc."
DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,Aderarea
DocType: Authorization Rule,Above Value,Valoarea de mai sus
,Pending Amount,În așteptarea Suma
-DocType: Purchase Invoice Item,Conversion Factor,Factor de Conversie
+DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
DocType: Serial No,Delivered,Livrat
apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurare de server de intrare pentru ocuparea forței de muncă id-ul de e-mail. (De exemplu jobs@example.com)
DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
@@ -1655,7 +1646,7 @@
apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborele de conturi finanial.
DocType: Leave Control Panel,Leave blank if considered for all employee types,Lăsați necompletat dacă se consideră pentru toate tipurile de angajați
DocType: Landed Cost Voucher,Distribute Charges Based On,Împărțiți taxelor pe baza
-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,"Contul {0} trebuie să fie de tip 'Valoare Stabilita' precum Articolul {1} este un Articol de Valoare"""
+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,Contul {0} trebuie să fie de tipul 'valoare stabilită' deoarece articolul {1} este un articol de valoare
DocType: HR Settings,HR Settings,Setări Resurse Umane
apps/frappe/frappe/config/setup.py +130,Printing,Tipărire
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
@@ -1672,12 +1663,12 @@
,Customer Acquisition and Loyalty,Achiziționare și Loialitate Client
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,Din Timpul nu poate fi mai mare de la ora
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Depozit în cazul în care se menține stocul de articole respinse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,An dvs. financiar se încheie pe
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,Anul dvs. financiar se încheie pe
DocType: POS Setting,Price List,Lista de prețuri
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} este acum implicit anul fiscal. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,Creanțe cheltuieli
DocType: Email Digest,Support,Suport
-DocType: Authorization Rule,Approving Role,Aprobarea Rolul
+DocType: Authorization Rule,Approving Role,Aprobare rol
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +89,Please specify currency in Company,Vă rugăm să specificați în valută companie
DocType: Workstation,Wages per hour,Salarii pe oră
apps/erpnext/erpnext/config/setup.py +53,"Show / Hide features like Serial Nos, POS etc.","Arată / Ascunde caracteristici cum ar fi de serie nr, POS etc"
@@ -1685,9 +1676,9 @@
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +51,Clearance date cannot be before check date in row {0},Data Aprobare nu poate fi anterioara datei de verificare pentru inregistrarea {0}
DocType: Salary Slip,Deduction,Deducere
-DocType: Address Template,Address Template,Format adresa
+DocType: Address Template,Address Template,Model adresă
DocType: Territory,Classification of Customers by region,Clasificarea clienți în funcție de regiune
-DocType: Project,% Tasks Completed,% Sarcini Finalizat
+DocType: Project,% Tasks Completed,% Sarcini finalizate
DocType: Project,Gross Margin,Marja Brută
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,utilizator dezactivat
@@ -1695,27 +1686,27 @@
DocType: Salary Slip,Total Deduction,Total de deducere
apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,Hei! Du-te și adăugați o adresă
DocType: Quotation,Maintenance User,Întreținere utilizator
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Cost Actualizat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,Sigur vrei să unstop
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Cost actualizat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,Sunteţi sigur că doriți să nu vă opriți
DocType: Employee,Date of Birth,Data Nașterii
DocType: Salary Manager,Salary Manager,Salariul Director
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,Articolul {0} a fost deja returnat
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Anul fiscal ** reprezintă un exercițiu financiar. Toate înregistrările contabile și alte tranzacții majore sunt urmărite împotriva ** Anul fiscal **.
-DocType: Opportunity,Customer / Lead Address,Client / Adresa Principala
-DocType: Production Order Operation,Actual Operation Time,Timpul efectiv de Funcționare
-DocType: Authorization Rule,Applicable To (User),Aplicabil Pentru (Utilizator)
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
+DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
+DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
+DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
DocType: Purchase Taxes and Charges,Deduct,Deduce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Job Description,Descrierea Postului
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Job Description,Descrierea postului
DocType: Purchase Order Item,Qty as per Stock UOM,Cantitate conform Stock UOM
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +34,Please select a valid csv file with data,Vă rugăm să selectați un fișier csv valid cu date
DocType: Features Setup,To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,"Pentru a urmări elementele din vânzări și achiziționarea de documente, cu lot nr cui <b> Industrie preferată: Produse chimice etc </ b>"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Coating,Strat
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment. "
-DocType: Expense Claim,Approver,Denunțător
+DocType: Expense Claim,Approver,Aprobator
,SO Qty,SO Cantitate
apps/erpnext/erpnext/accounts/doctype/account/account.py +127,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
-DocType: Appraisal,Calculate Total Score,Calculeaza Scor Total
+DocType: Appraisal,Calculate Total Score,Calculaţi scor total
DocType: Salary Slip Deduction,Depends on LWP,Depinde de LWP
DocType: Supplier Quotation,Manufacturing Manager,Manufacturing Manager de
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +201,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
@@ -1732,31 +1723,31 @@
DocType: Global Defaults,Default Company,Companie Implicita
apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cheltuială sau Diferența cont este obligatorie pentru postul {0}, deoarece impactul valoare totală de stoc"
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","Nu pot overbill pentru postul {0} în rândul {1} mai mult {2}. Pentru a permite supraîncărcată, vă rugăm să setați în stoc Setări"
-DocType: Employee,Bank Name,Nume Banca
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+DocType: Employee,Bank Name,Denumire bancă
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,de mai sus
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,Utilizatorul {0} este dezactivat
DocType: Leave Application,Total Leave Days,Total de zile de concediu
DocType: Email Digest,Note: Email will not be sent to disabled users,Notă: Adresa de email nu va fi trimis la utilizatorii cu handicap
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selectați Company ...
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selectați compania ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Lăsați necompletat dacă se consideră pentru toate departamentele
apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} este obligatorie pentru postul {1}
-DocType: Currency Exchange,From Currency,Din Valuta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+DocType: Currency Exchange,From Currency,Din moneda
DocType: DocField,Name,Nume
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +61,Last Sales Order Date,Ultima comandă de vânzări Data
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +90,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in system,Nu Sumele reflectate în sistem
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in system,Sumele nu sunt corespunzătoare cu sistemul
DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altel
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Production might not be able to finish by the Expected Delivery Date.,Producția ar putea să nu fie în măsură să termine de așteptat Data de livrare.
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +19,Set as Stopped,Setați ca Oprit
DocType: POS Setting,Taxes and Charges,Impozite și Taxe
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau ținut în stoc."
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau păstrat în stoc."
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,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Finalizat
DocType: Web Form,Select DocType,Selectați DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Broaching,Broșat
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Broaching,Broșare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Banking,Bancar
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +48,Please click on 'Generate Schedule' to get schedule,"Vă rugăm să faceți clic pe ""Generate Program"", pentru a obține programul"
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +276,New Cost Center,Centru de cost nou
@@ -1765,7 +1756,7 @@
DocType: Quality Inspection,In Process,În procesul de
DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
DocType: Purchase Receipt,Detailed Breakup of the totals,Diviziune detaliată a totalurilor
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} împotriva comandă de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
DocType: Account,Fixed Asset,Activ Fix
DocType: Time Log Batch,Total Billing Amount,Suma totală de facturare
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contul de încasat
@@ -1775,7 +1766,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +259,Time Logs created:,Timp Busteni creat:
DocType: Company,If Yearly Budget Exceeded,In cazul in care exista Excedent Bugetar Anual
DocType: Item,Weight UOM,Greutate UOM
-DocType: Employee,Blood Group,Grupa de Sânge
+DocType: Employee,Blood Group,Grupă de sânge
DocType: Purchase Invoice Item,Page Break,Page Break
DocType: Production Order Operation,Pending,În așteptarea
DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizatorii care poate aproba cererile de concediu o anumită angajatilor
@@ -1783,7 +1774,7 @@
DocType: Purchase Invoice Item,Qty,Cantitate
DocType: Fiscal Year,Companies,Companii
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +23,Electronics,Electronică
-DocType: Email Digest,"Balances of Accounts of type ""Bank"" or ""Cash""","Bilanturile conturilor de tip ""Bank"" sau ""Cash"""
+DocType: Email Digest,"Balances of Accounts of type ""Bank"" or ""Cash""","Bilanţurile conturilor de tip ""bancă"" sau ""numerar"""
DocType: Shipping Rule,"Specify a list of Territories, for which, this Shipping Rule is valid","Specificați o listă de teritorii, pentru care, aceasta regula transport maritim este valabil"
DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ridica Material Cerere atunci când stocul ajunge la nivelul re-comandă
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Din Program de Intretinere
@@ -1796,7 +1787,7 @@
DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
DocType: Offer Letter Term,Offer Term,Termen oferta
-DocType: Quality Inspection,Quality Manager,Manager de Calitate
+DocType: Quality Inspection,Quality Manager,Manager de calitate
DocType: Job Applicant,Job Opening,Deschidere Loc de Muncă
DocType: Payment Reconciliation,Payment Reconciliation,Reconcilierea plată
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +164,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
@@ -1813,13 +1804,12 @@
DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
-DocType: Manufacturing Settings,Allow Overtime,Permiteți Orele suplimentare
+DocType: Manufacturing Settings,Allow Overtime,Permiteți ore suplimentare
apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,Comandă de vânzări {0} este oprit
DocType: Email Digest,New Leads,Oportunitati noi
DocType: Stock Reconciliation Item,Current Valuation Rate,Rata de evaluare curentă
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,"Advance paid against {0} {1} cannot be greater \
- than Grand Total {2}","Avansul plătit de {0} {1} nu poate fi mai mare decât \
- Grand Raport {2}"
+ than Grand Total {2}",Avansul plătit comparativ {0} {1} nu poate fi mai mare \ decât totalul general {2}
DocType: Opportunity,Lost Reason,Motiv Pierdere
apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creați Intrările de plată împotriva comenzi sau facturi.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,Sudare
@@ -1833,38 +1823,38 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +8,Not Received,A primit
DocType: Branch,Branch,Ramură
DocType: Sales Invoice,Customer (Receivable) Account,Cont Client (Receptionabil)
-DocType: Bin,Actual Quantity,Cantitate Efectiva
+DocType: Bin,Actual Quantity,Cantitate Efectivă
DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Serial No {0} not found,Serial nr {0} nu a fost găsit
DocType: Shopping Cart Settings,Price Lists,Lista de preturi
DocType: Purchase Invoice,Considered as Opening Balance,Considerat ca Balanta de Deschidere
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +513,Your Customers,Clienții dvs.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Compression molding,Turnare prin compresie
-DocType: Leave Block List Date,Block Date,Data Blocare
+DocType: Leave Block List Date,Block Date,Dată blocare
DocType: Sales Order,Not Delivered,Nu Pronunțată
-,Bank Clearance Summary,Sumar Aprobare Banca
+,Bank Clearance Summary,Sumar aprobare bancă
apps/erpnext/erpnext/config/setup.py +75,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Cod articol> Articol Grupa> Brand
-DocType: Appraisal Goal,Appraisal Goal,Obiectiv Expertiza
+DocType: Appraisal Goal,Appraisal Goal,Obiectiv expertiză
DocType: Event,Friday,Vineri
DocType: Time Log,Costing Amount,Costing Suma
DocType: Salary Manager,Submit Salary Slip,Prezenta Salariul Slip
DocType: Salary Structure,Monthly Earning & Deduction,Câștigul salarial lunar & Deducerea
apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Reducere Maxiumm pentru postul {0} este {1}%
-DocType: Supplier,Address & Contacts,Adresa si Contact
+DocType: Supplier,Address & Contacts,Adresă şi contacte
DocType: SMS Log,Sender Name,Sender Name
DocType: Page,Title,Titlu
sites/assets/js/list.min.js +92,Customize,Personalizeaza
-DocType: POS Setting,[Select],[Select]
+DocType: POS Setting,[Select],[Selectati]
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Realizeaza Factura de Vanzare
DocType: Company,For Reference Only.,Numai Pentru referință.
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Invalid {0}: {1}
DocType: Sales Invoice Advance,Advance Amount,Sumă în avans
DocType: Manufacturing Settings,Capacity Planning,Planificarea capacității
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"'Din Data' este necesară"""
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Din Data' este necesar
DocType: Journal Entry,Reference Number,Numărul de referință
-DocType: Employee,Employment Details,Detalii Angajare
-DocType: Employee,New Workplace,Nou la locul de muncă
+DocType: Employee,Employment Details,Detalii angajare
+DocType: Employee,New Workplace,Nou loc de muncă
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Setați ca Închis
apps/erpnext/erpnext/stock/get_item_details.py +104,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cazul Nr. nu poate fi 0
@@ -1873,10 +1863,10 @@
apps/erpnext/erpnext/setup/doctype/company/company.py +71,Stores,Magazine
DocType: Time Log,Projects Manager,Manager Proiecte
DocType: Serial No,Delivery Time,Timp de Livrare
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Îmbătrânirea Bazat pe
-DocType: Item,End of Life,Sfarsitul Vietii
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
+DocType: Item,End of Life,Sfârsitul vieții
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Călători
-DocType: Leave Block List,Allow Users,Permite utilizatori
+DocType: Leave Block List,Allow Users,Permiteți utilizatori
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +199,Operation is Mandatory,Funcționarea este obligatorie
DocType: Purchase Order,Recurring,Recurent
DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Urmăriți Venituri separat și cheltuieli verticale produse sau divizii.
@@ -1888,9 +1878,9 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
-DocType: Stock Settings,Allow Negative Stock,Permite Stoc Negativ
+DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
DocType: Installation Note,Installation Note,Instalare Notă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,Add Taxes,Adauga Taxe
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,Add Taxes,Adăugaţi Taxe
,Financial Analytics,Analitica Financiara
DocType: Quality Inspection,Verified By,Verificate de
DocType: Address,Subsidiary,Filială
@@ -1899,12 +1889,12 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
DocType: Salary Manager,Create Salary Slip,Crea Fluturasul de Salariul
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +44,Expected balance as per bank,Sold estimat ca pe bancă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,Tampon
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,Şlefuire
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sursa fondurilor (pasive)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
DocType: Appraisal,Employee,Angajat
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email la
-DocType: Features Setup,After Sale Installations,După Instaurarea Vanzarii
+DocType: Features Setup,After Sale Installations,Echipamente premergătoare vânzării
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} este complet facturat
DocType: Workstation Working Hour,End Time,End Time
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Clauzele contractuale standard pentru vânzări sau de cumpărare.
@@ -1920,20 +1910,20 @@
DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>",
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Size,Dimensiune
DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
-DocType: Email Digest,Calendar Events,Evenimente Calendar
+DocType: Email Digest,Calendar Events,Evenimente calendar
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +108,Pharmaceutical,Farmaceutic
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Creare Client
DocType: Purchase Invoice,Credit To,De Creditat catre
DocType: Employee Education,Post Graduate,Postuniversitar
-DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Notă: Backup și fișierele nu sunt șterse de la Dropbox, va trebui să le ștergeți manual."
+DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Notă: Backup-ul și fișierele nu sunt șterse de la Dropbox, va trebui să le ștergeți manual."
DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalii Program Mentenanta
DocType: Quality Inspection Reading,Reading 9,Lectură 9
-DocType: Buying Settings,Buying Settings,Setări Cumpararea
+DocType: Buying Settings,Buying Settings,Configurări cumparare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,Finisare masă
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nr. FDM pentru un articol final bun
-DocType: Upload Attendance,Attendance To Date,Participarea la Data
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nr. BOM pentru un articol tip produs finalizat
+DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
apps/erpnext/erpnext/config/selling.py +153,Setup incoming server for sales email id. (e.g. sales@example.com),Configurare de server de intrare pentru ID-ul de e-mail de vânzări. (De exemplu sales@example.com)
DocType: Warranty Claim,Raised By,Ridicate de
DocType: Payment Tool,Payment Account,Cont de plăți
@@ -1947,21 +1937,21 @@
DocType: Print Settings,Modern,Modern
DocType: Communication,Replied,A răspuns:
DocType: Payment Tool,Total Payment Amount,Raport de plată Suma
-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}) nu poate fi mai mare decât quanitity planificat ({2}) în Producție Comanda {3}
+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}) nu poate fi mai mare decât cantitatea planificată ({2}) aferent comenzii de producție {3}
DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-DocType: Newsletter,Test,Teste
+DocType: Newsletter,Test,Test
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
DocType: Employee,Previous Work Experience,Anterior Work Experience
DocType: Stock Entry,For Quantity,Pentru Cantitate
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} nu este prezentată
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} nu este introdus
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Cererile de elemente.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pentru producerea separată va fi creat pentru fiecare articol bun finit.
-DocType: Email Digest,New Communications,Noi Comunicații
+DocType: Email Digest,New Communications,Comunicații noi
DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup, Setare Finalizata
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocate până la această dată, nimeni nu poate crea / modifica intrararea cu excepția functiei specificata mai jos."
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocată până la această dată, nimeni nu poate crea / modifica intrarea cu excepția rolului specificat mai jos."
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +124,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stare de proiect
DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
@@ -1970,7 +1960,7 @@
DocType: Contact,Enter department to which this Contact belongs,Introduceti departamentul de care apartine acest Contact
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Raport Absent
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unitatea de măsură
+apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unitate de măsură
DocType: Fiscal Year,Year End Date,Anul Data de încheiere
DocType: Task Depends On,Task Depends On,Sarcina Depinde
DocType: Lead,Opportunity,Oportunitate
@@ -1980,27 +1970,27 @@
DocType: Email Digest,Inventory & Support,Inventarul & Suport
DocType: Notification Control,Expense Claim Approved Message,Mesaj Aprobare Revendicare Cheltuieli
DocType: Email Digest,How frequently?,Cât de frecvent?
-DocType: Purchase Receipt,Get Current Stock,Obtine Stocul Curent
+DocType: Purchase Receipt,Get Current Stock,Obține stocul curent
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,Realizeaza Nota de Instalare
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
DocType: Production Order,Actual End Date,Data efectiva de finalizare
-DocType: Authorization Rule,Applicable To (Role),Aplicabil Pentru (Rol)
+DocType: Authorization Rule,Applicable To (Role),Aplicabil pentru (rol)
DocType: Stock Entry,Purpose,Scopul
DocType: Item,Will also apply for variants unless overrridden,Se va aplica și pentru variantele cu excepția cazului în overrridden
DocType: Purchase Invoice,Advances,Avansuri
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Aprobarea Utilizatorul nu poate fi aceeași ca și utilizator regula este aplicabilă
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Aprobarea unui utilizator nu poate fi aceeași cu utilizatorul. Regula este aplicabilă pentru
DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
-DocType: Campaign,Campaign-.####,Campanie.# # # #
+DocType: Campaign,Campaign-.####,Campanie-.####
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Make Invoice,Realizare Factura
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Piercing,Pătrunzător
DocType: Customer,Your Customer's TAX registration numbers (if applicable) or any general information,Numerele de înregistrare fiscală clientului dumneavoastră (dacă este cazul) sau orice informații generale
apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuitor terță parte / dealer / comision agent / afiliat / reseller care vinde produsele companiilor pentru un comision.
-DocType: Customer Group,Has Child Node,Are Nod Copil
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} împotriva Ordinului de Procurare {1}
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuitor terță parte / dealer / agent comision / afiliat / reseller care vinde produsele companiilor pentru un comision.
+DocType: Customer Group,Has Child Node,Are nod fiu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduceți parametrii url statici aici (de exemplu, expeditor = ERPNext, numele de utilizator = ERPNext, parola = 1234, etc)"
apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gama Îmbătrânirea 1
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Clasă de uzură 1
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Photochemical machining,Prelucrare fotochimic
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.
@@ -2050,9 +2040,9 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,Setați ca destupate
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / cont Cash
+DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Această aplicație concediul este în curs de aprobare. Numai Leave aprobator poate actualiza starea.
-DocType: Global Defaults,Hide Currency Symbol,Ascunde Simbol Valuta
+DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
DocType: Journal Entry,Credit Note,Nota de Credit
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +206,Completed Qty cannot be more than {0} for operation {1},Completat Cantitate nu poate fi mai mare de {0} pentru funcționare {1}
@@ -2066,7 +2056,7 @@
DocType: Opportunity,Customer / Lead Name,Client / Nume Principal
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +61,Clearance Date not mentioned,Data Aprobare nespecificata
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +66,Production,Producţie
-DocType: Item,Allow Production Order,Permite Ordin de Productie
+DocType: Item,Allow Production Order,Permiteţi comandă de producţie
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
DocType: Installation Note Item,Installed Qty,Instalat Cantitate
@@ -2079,7 +2069,7 @@
DocType: Purchase Invoice,Will be calculated automatically when you enter the details,Vor fi calculate automat atunci când introduceți detaliile
DocType: Delivery Note,Transporter lorry number,Număr Transporter camion
DocType: Sales Order,Billing Status,Stare facturare
-DocType: Backup Manager,Backup Right Now,Efectueaza Backup Chiar Acum
+DocType: Backup Manager,Backup Right Now,Efectuaţi backup în acest moment
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Cheltuieli de utilitate
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-sus
DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
@@ -2093,7 +2083,7 @@
DocType: Purchase Invoice,Total Taxes and Charges,Total Impozite și Taxe
DocType: Email Digest,Payments Made,Plățile efectuate
DocType: Employee,Emergency Contact,Contact de Urgență
-DocType: Item,Quality Parameters,Parametrii de calitate
+DocType: Item,Quality Parameters,Parametri de calitate
DocType: Target Detail,Target Amount,Suma țintă
DocType: Shopping Cart Settings,Shopping Cart Settings,Setări Cosul de cumparaturi
DocType: Journal Entry,Accounting Entries,Înregistrări contabile
@@ -2113,16 +2103,16 @@
DocType: Party Type,Parent Party Type,Tip Party părinte
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Cutting,Tăiere
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flattening,Aplatizare
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,Backupurile vor fi încărcate la
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,Backup-urile vor fi încărcate la
DocType: Account,Income Account,Contul de venit
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,Turnare
-DocType: Stock Reconciliation Item,Current Qty,Curent Cantitate
+DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
DocType: Item Reorder,Material Request Type,Material Cerere tip
apps/frappe/frappe/desk/moduleview.py +61,Documents,Documente
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Re
-DocType: Cost Center,Cost Center,Centrul de Cost
+DocType: Cost Center,Cost Center,Centrul de cost
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
DocType: Notification Control,Purchase Order Message,Purchase Order Mesaj
DocType: Upload Attendance,Upload HTML,Încărcați HTML
@@ -2150,13 +2140,13 @@
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Numele noului centru de cost
DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
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.,Nu Format implicit Adresa găsit. Vă rugăm să creați unul nou de la Setup> Imprimare și Branding> Format Adresa.
-DocType: Appraisal,HR User,HR utilizator
+DocType: Appraisal,HR User,Utilizator HR
DocType: Purchase Invoice,Taxes and Charges Deducted,Impozite și Taxe dedus
apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Probleme
apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},Starea trebuie să fie una din {0}
DocType: Sales Invoice,Debit To,Debit Pentru
DocType: Delivery Note,Required only for sample item.,Necesar numai pentru element de probă.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant Efectiva După Tranzacție
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,Extra mare
,Profit and Loss Statement,Profit și pierdere
@@ -2164,7 +2154,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Pressing,Presare
DocType: Payment Tool Detail,Payment Tool Detail,Plata Instrumentul Detalii
,Sales Browser,Vânzări Browser
-DocType: Journal Entry,Total Credit,Total de Credit
+DocType: Journal Entry,Total Credit,Total credit
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,Local
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
@@ -2176,7 +2166,7 @@
DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Polishing,Lustruire
DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Alocate
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Alocat
apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Precizați Rata de schimb a converti o monedă în alta
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row{0}: Party Type and Party is only applicable against Receivable / Payable account,Rând {0}: Partidul Tipul și Partidul este aplicabilă numai împotriva încasat / cont de plati
@@ -2185,7 +2175,7 @@
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Angajatul {0} a fost în concediu pe {1}. Nu se poate marca prezență.
DocType: Sales Partner,Targets,Obiective
DocType: Price List,Price List Master,Lista de preturi Masterat
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzare pot fi etichetate împotriva mai multor ** Persoane de vânzări ** astfel încât să puteți seta și să monitorizeze obiective.
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
,S.O. No.,SO Nu.
DocType: Production Order Operation,Make Time Log,Fa-ti timp Log
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +162,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
@@ -2196,8 +2186,8 @@
DocType: Purchase Invoice,Ignore Pricing Rule,Ignora Regula Preturi
sites/assets/js/list.min.js +23,Cancelled,Anulat
DocType: Employee Education,Graduate,Absolvent
-DocType: Leave Block List,Block Days,Zile de Blocare
-DocType: Journal Entry,Excise Entry,Accize intrare
+DocType: Leave Block List,Block Days,Zile de blocare
+DocType: Journal Entry,Excise Entry,Intrare accize
DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
Examples:
@@ -2227,12 +2217,12 @@
apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Cheltuială cont / Diferența ({0}) trebuie să fie un cont de ""profit sau pierdere"""
DocType: Account,Accounts User,Conturi de utilizator
DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Bifati pentru factura recurenta, debifați pentru a opri recurenta sau introduceti Data de Incheiere"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Spectatori pentru angajat {0} este deja marcat
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,Maxime {0} rânduri permis
DocType: C-Form Invoice Detail,Net Total,Total net
DocType: Bin,FCFS Rate,Rata FCFS
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturare (factura de vânzare)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturare (factură de vânzare)
DocType: Payment Reconciliation Invoice,Outstanding Amount,Remarcabil Suma
DocType: Project Task,Working,De lucru
DocType: Stock Ledger Entry,Stock Queue (FIFO),Stoc Queue (FIFO)
@@ -2270,14 +2260,14 @@
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.,Procentul de reducere se poate aplica fie pe o listă de prețuri sau pentru toate lista de prețuri.
DocType: Purchase Invoice,Half-yearly,Semestrial
apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anul fiscal {0} nu a fost găsit.
-DocType: Bank Reconciliation,Get Relevant Entries,Obtine Intrările Relevante
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,Intrare Contabilitate pentru stoc
+DocType: Bank Reconciliation,Get Relevant Entries,Obține intrările relevante
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,Intrare contabilitate pentru stoc
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,Coining
DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,Articolul {0} nu există
DocType: Item,"Selecting ""Yes"" will allow you to make a Production Order for this item.","Selectând ""Da"", vă va permite să facă o comandă de producție pentru acest articol."
-DocType: Sales Invoice,Customer Address,Adresa Client
-DocType: Purchase Invoice,Total,totală
+DocType: Sales Invoice,Customer Address,Adresă client
+DocType: Purchase Invoice,Total,Total
DocType: Backup Manager,System for managing Backups,Sistem de gestionare a Backup
DocType: Account,Root Type,Rădăcină Tip
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Parcelarea / Reprezentarea grafică / Trasarea
@@ -2291,22 +2281,22 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,Contul {0} este Blocat
DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
-apps/erpnext/erpnext/config/setup.py +116,Address master.,Titularul Adresei.
+apps/erpnext/erpnext/config/setup.py +116,Address master.,Titular adresă.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL sau BS
apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivelul minim Inventarul
DocType: Stock Entry,Subcontract,Subcontract
DocType: Production Planning Tool,Get Items From Sales Orders,Obține Articole din Comenzi de Vânzări
-DocType: Production Order Operation,Actual End Time,Actual End Time
+DocType: Production Order Operation,Actual End Time,Timp efectiv de sfârşit
DocType: Production Planning Tool,Download Materials Required,Descărcare Materiale Necesara
DocType: Item,Manufacturer Part Number,Numarul de piesa
DocType: Production Order Operation,Estimated Time and Cost,Timpul estimat și cost
-DocType: Bin,Bin,Cos
+DocType: Bin,Bin,Coş
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Nosing,Nosing
DocType: SMS Log,No of Sent SMS,Nu de SMS-uri trimise
DocType: Account,Company,Compania
-DocType: Account,Expense Account,Cont de Cheltuieli
+DocType: Account,Expense Account,Cont de cheltuieli
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,Culoare
DocType: Maintenance Visit,Scheduled,Programat
@@ -2319,14 +2309,14 @@
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Până la
DocType: Rename Tool,Rename Log,Redenumi Conectare
-DocType: Installation Note Item,Against Document No,Împotriva Documentul nr
+DocType: Installation Note Item,Against Document No,Împotriva documentul nr
apps/erpnext/erpnext/config/selling.py +93,Manage Sales Partners.,Gestiona vânzările Partners.
DocType: Quality Inspection,Inspection Type,Inspecție Tip
apps/erpnext/erpnext/controllers/recurring_document.py +160,Please select {0},Vă rugăm să selectați {0}
-DocType: C-Form,C-Form No,Nr. Forma-C
+DocType: C-Form,C-Form No,Nr. formular-C
DocType: BOM,Exploded_items,Exploded_items
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +90,Researcher,Cercetător
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +87,Update,Actualizați
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +87,Update,Actualizare
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +75,Please save the Newsletter before sending,Vă rugăm să salvați Newsletter înainte de a trimite
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nume sau E-mail este obligatorie
apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Control de calitate de intrare.
@@ -2335,7 +2325,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Serial No {0} created,Serial Nu {0} a creat
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Vibratory finishing,Finisare vibratorie
DocType: Item,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
-DocType: Journal Entry Account,Against Purchase Order,Împotriva Comandă
+DocType: Journal Entry Account,Against Purchase Order,Comparativ comenzii de cumpărare
DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
DocType: Sales Invoice,Advertisement,Reclamă
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +160,Probationary Period,Perioadă De Probă
@@ -2352,14 +2342,14 @@
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,"Nu {0} Stare de serie trebuie să fie ""disponibile"" pentru a oferi"
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titlul Adresei este obligatoriu.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titlul adresei este obligatoriu.
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduceți numele de campanie dacă sursa de anchetă este campanie
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,Editorii de ziare
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selectați anul fiscal
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Smelting,Metalurgie
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,"Sunteți aprobator Lăsați pentru această înregistrare. Vă rugăm Actualizați ""statutul"" și Salvare"
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
-DocType: Attendance,Attendance Date,Spectatori Data
+DocType: Attendance,Attendance Date,Dată prezenţă
DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
DocType: Address,Preferred Shipping Address,Preferat Adresa Shipping
@@ -2368,10 +2358,10 @@
DocType: Item,Valuation Method,Metoda de evaluare
DocType: Sales Invoice,Sales Team,Echipa de vânzări
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Duplicate entry,Inregistrare duplicat
-DocType: Serial No,Under Warranty,Sub garanție
+DocType: Serial No,Under Warranty,În garanție
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +425,[Error],[Eroare]
DocType: Sales Order,In Words will be visible once you save the Sales Order.,În cuvinte va fi vizibil după ce a salva comanda de vânzări.
-,Employee Birthday,Zi de Naștere Angajat
+,Employee Birthday,Zi de naștere angajat
DocType: GL Entry,Debit Amt,Debit Amt
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Venture Capital,Capital de Risc
DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
@@ -2380,15 +2370,15 @@
DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,Comenzi
-DocType: Leave Control Panel,Employee Type,Tip Angajat
+DocType: Leave Control Panel,Employee Type,Tip angajat
DocType: Employee Leave Approver,Leave Approver,Aprobator Concediu
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,Forjare la cald
-DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilizator cu ""cheltuieli aprobator"" rol"
+DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilizator cu rol de ""aprobator cheltuieli"""
,Issued Items Against Production Order,Emise Articole împotriva producției de comandă
DocType: Pricing Rule,Purchase Manager,Cumpărare Director
DocType: Payment Tool,Payment Tool,Plata Instrumentul
DocType: Target Detail,Target Detail,Țintă Detaliu
-DocType: Sales Order,% of materials billed against this Sales Order,% din materialele facturate comparate cu acest Ordinul de Vânzări
+DocType: Sales Order,% of materials billed against this Sales Order,% din materialele facturate comparativ cu această comandă de vânzări
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Intrarea Perioada de închidere
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,Centrul de Cost cu tranzacții existente nu poate fi transformat în grup
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciere
@@ -2400,22 +2390,22 @@
apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selectați tipul de tranzacție
DocType: GL Entry,Voucher No,Voletul nr
DocType: Leave Allocation,Leave Allocation,Alocare Concediu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,"'Actualizeaza Stocul' pentru Factura de Vanzari {0} trebuie să fie stabilit"""
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,'Actualizează stoc' pentru factura de vânzări {0} trebuie să fie stabilit
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,Cererile de materiale {0} a creat
apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,Șablon de termeni sau contractului.
DocType: Employee,Feedback,Reactie
apps/erpnext/erpnext/accounts/party.py +192,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Abrasive jet machining,Prelucrare cu jet abraziv
DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
-DocType: Website Settings,Website Settings,Setarile site ului
+DocType: Website Settings,Website Settings,Setarile site-ului
DocType: Activity Cost,Billing Rate,Rata de facturare
,Qty to Deliver,Cantitate pentru a oferi
DocType: Monthly Distribution Percentage,Month,Lună
,Stock Analytics,Analytics stoc
-DocType: Installation Note Item,Against Document Detail No,Împotriva Detaliilor Documentului Nr.
+DocType: Installation Note Item,Against Document Detail No,Comparativ detaliilor documentului nr.
DocType: Quality Inspection,Outgoing,Trimise
DocType: Material Request,Requested For,Pentru a solicitat
-DocType: Quotation Item,Against Doctype,Împotriva Tipuli Documentului
+DocType: Quotation Item,Against Doctype,Comparativ tipului documentului
DocType: Delivery Note,Track this Delivery Note against any Project,Urmareste acest Livrare Note împotriva oricărui proiect
apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Root account can not be deleted,Contul de root nu pot fi șterse
DocType: GL Entry,Credit Amt,Credit Amt
@@ -2439,14 +2429,14 @@
apps/erpnext/erpnext/config/selling.py +122,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
DocType: Sales Invoice,Write Off Outstanding Amount,Scrie Off remarcabile Suma
DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Verificați dacă aveți nevoie de facturi recurente automate. După introducerea oricarei factură de vânzare, sectiunea Recurente va fi vizibila."
-DocType: Account,Accounts Manager,Conturi de Management
+DocType: Account,Accounts Manager,Manager de Conturi
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',"Ora Log {0} trebuie să fie ""Înscris"""
DocType: Stock Settings,Default Stock UOM,Stoc UOM Implicit
DocType: Production Planning Tool,Create Material Requests,Creare Necesar de Materiale
DocType: Employee Education,School/University,Școlar / universitar
-DocType: Sales Invoice Item,Available Qty at Warehouse,Cant disponibila in Depozit
-,Billed Amount,Suma Facturata
-DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere Bancara
+DocType: Sales Invoice Item,Available Qty at Warehouse,Cantitate disponibilă în depozit
+,Billed Amount,Sumă facturată
+DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
DocType: Purchase Invoice,Total Amount To Pay,Suma totală să plătească
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
DocType: Event,Groups,Grupuri
@@ -2454,14 +2444,14 @@
DocType: Sales Order,Fully Delivered,Livrat complet
DocType: Lead,Lower Income,Micsoreaza Venit
DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Contul capul sub răspunderii, în care Profit / pierdere va fi rezervat"
-DocType: Payment Tool,Against Vouchers,Pe baza documentelor justificative
+DocType: Payment Tool,Against Vouchers,Comparativ voucherului
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajutor rapid
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},Sursă și depozit țintă nu poate fi același pentru rând {0}
DocType: Features Setup,Sales Extras,Extras de vânzare
-apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} de buget pentru contul {1} contra cost Centrul de {2} va depăși de {3}
+apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},bugetul {0} pentru contul {1} comparativ centrului de cost {2} va fi depășit cu {3}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
DocType: Leave Allocation,Carry Forwarded Leaves,Trasmite Concedii Inaintate
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie ulterioara datei 'Pana in Data'
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie ulterior 'Pană în Data'
,Stock Projected Qty,Stoc proiectată Cantitate
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
DocType: Warranty Claim,From Company,De la Compania
@@ -2474,21 +2464,21 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,Factorul de conversie nu pot fi în fracțiuni
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,Îl veti folosi pentru autentificare
DocType: Sales Partner,Retailer,Vânzător cu amănuntul
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Toate Tipurile de Furnizor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Toate tipurile de furnizor
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Citat {0} nu de tip {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
DocType: Sales Order,% Delivered,% Livrat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Descoperirea de Cont Bancar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Descoperire cont bancar
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Realizeaza Fluturas de Salar
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Unstop
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Împrumuturi garantate
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignorat:
-apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} nu pot fi achiziționate cu ajutorul Cosul de cumparaturi
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse Extraordinare
+apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} nu poate fi achiziționat cu ajutorul coșului de cumpărături
+apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse extraordinare
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Sold 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,Nu se poate aproba concediu deoarece nu sunteti autorizat să aprobati concedii in Date Blocate
-DocType: Appraisal,Appraisal,Expertiza
+DocType: Appraisal,Appraisal,Expertiză
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Lost-foam casting,Turnare a pierdut-spumă
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Drawing,Desen
apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data se repetă
@@ -2498,7 +2488,7 @@
DocType: Workstation Working Hour,Start Time,Ora de începere
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +183,Select Quantity,Selectați Cantitate
DocType: Sales Taxes and Charges Template,"Specify a list of Territories, for which, this Taxes Master is valid","Specificați o listă de teritorii, pentru care, aceasta Taxe Master este valabil"
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprobarea rol nu poate fi la fel ca rolul statului este aplicabilă
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprobarea unui rol nu poate fi aceeaşi cu rolul. Regula este aplicabilă pentru
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +41,Message Sent,Mesajul a fost trimis
DocType: Production Plan Sales Order,SO Date,SO Data
DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Rata la care lista de prețuri moneda este convertit în valuta de bază a clientului
@@ -2506,7 +2496,7 @@
DocType: BOM Operation,Hour Rate,Rata Oră
DocType: Stock Settings,Item Naming By,Denumire Articol Prin
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,Din Ofertă
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},O altă intrare Inchidere de Perioada {0} a fost efectuata după {1}
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
DocType: Production Order,Material Transferred for Manufacturing,Material Transferat pentru Manufacturing
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Contul {0} nu există
DocType: Purchase Receipt Item,Purchase Order Item No,Comandă de aprovizionare Punctul nr
@@ -2523,13 +2513,13 @@
DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
DocType: Serial No,Is Cancelled,Este anulat
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,Livrările mele
-DocType: Journal Entry,Bill Date,Data Factura
+DocType: Journal Entry,Bill Date,Dată factură
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:","Chiar dacă există mai multe reguli de stabilire a prețurilor, cu cea mai mare prioritate, se aplică apoi următoarele priorități interne:"
DocType: Supplier,Supplier Details,Detalii furnizor
DocType: Communication,Recipients,Destinatarii
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Screwing,Înșurubare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Knurling,Knurling
-DocType: Expense Claim,Approval Status,Status de Aprobare
+DocType: Expense Claim,Approval Status,Status aprobare
DocType: Hub Settings,Publish Items to Hub,Publica produse în Hub
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +38,From value must be less than to value in row {0},Din valoare trebuie să fie mai mică decat in valoare pentru inregistrarea {0}
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +128,Wire Transfer,Transfer
@@ -2547,7 +2537,7 @@
DocType: Project,Total Costing Amount (via Time Logs),Suma totală Costing (prin timp Busteni)
DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} este înscris mai mult de o dată la postul tabel variante
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} este introdus de mai multe ori în tabelul variante articole
,Projected,Proiectat
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {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},Notă: Cerere Data depășește zile de credit permise de {0} zile pentru {1} {2}
@@ -2561,13 +2551,13 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +680,From Sales Order,Din Comanda de Vânzări
DocType: Blog Category,Parent Website Route,Părinte Site Route
DocType: Sales Order,Not Billed,Nu Taxat
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambele Depozite trebuie să aparțină aceleiași companii
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
sites/assets/js/erpnext.min.js +20,No contacts added yet.,Nu contact adăugat încă.
apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nu este activ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +43,Against Invoice Posting Date,Împotriva factură postare Data
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +43,Against Invoice Posting Date,Comparativ datei de afișare factură
DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Costul Landed Voucher Suma
-DocType: Time Log,Batched for Billing,Transformat in Lot pentru Facturare
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturi cu valoarea ridiacata de catre furnizori.
+DocType: Time Log,Batched for Billing,Transformat în lot pentru facturare
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
DocType: POS Setting,Write Off Account,Scrie Off cont
DocType: Purchase Invoice,Discount Amount,Reducere Suma
DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
@@ -2575,11 +2565,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,"de exemplu, TVA"
DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
-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","Există un articol cu același nume ({0}), vă rugăm să schimbați numele grupului articolului sau redenumiti articolul"
+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","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,Gaz de metal la cald
DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Depozit {0}: Company este obligatorie
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Depozit {0}: Compania este obligatorie
DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,"Variație procentuală, în cantitate va fi permisă în timp ce primirea sau livrarea acestui articol."
DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,Shopping Impozite și taxe cos Facultate
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.","Du-te la grupul corespunzător (de obicei, sursa fondurilor> Pasive curente> taxelor și impozitelor și a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip "fiscal" și de a face mai vorbim rata de impozitare."
@@ -2589,19 +2579,19 @@
DocType: Event,Monday,Luni
DocType: Journal Entry,Stock Entry,Stoc de intrare
DocType: Account,Payable,Plătibil
-DocType: Salary Slip,Arrear Amount,Restanță Suma
+DocType: Salary Slip,Arrear Amount,Sumă restantă
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clienți noi
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Profit Brut%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
DocType: Bank Reconciliation Detail,Clearance Date,Data Aprobare
DocType: Newsletter,Newsletter List,List Newsletter
DocType: Salary Manager,Check if you want to send salary slip in mail to each employee while submitting salary slip,Verificați dacă doriți să trimiteți fișa de salariu în e-mail-ul fiecarui angajat în timpul introducerii salariului.
-DocType: Lead,Address Desc,Adresa Desc
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Cel putin una din vânzarea sau cumpărarea trebuie să fie selectată
+DocType: Lead,Address Desc,Adresă Desc
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Cel puţin una din opţiunile de vânzare sau cumpărare trebuie să fie selectată
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","Diferența de Cont trebuie să fie un cont de tip 'Răspundere', deoarece acest Reconciliere de Stoc este o Intrare de Deschidere"
apps/erpnext/erpnext/stock/doctype/item/item.js +215,"Variants can not be created manually, add item attributes in the template item","Variantele nu pot fi create manual, adăugați atribute de elemente în elementul șablon"
apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,În cazul în care operațiunile de fabricație sunt efectuate.
-DocType: Page,All,Toate
+DocType: Page,All,Tot
DocType: Stock Entry Detail,Source Warehouse,Depozit sursă
DocType: Installation Note,Installation Date,Data de instalare
DocType: Employee,Confirmation Date,Data de Confirmare
@@ -2613,12 +2603,12 @@
DocType: Lead,Lead Owner,Proprietar Conducere
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +241,Warehouse is required,Este necesar depozit
DocType: Employee,Marital Status,Stare civilă
-DocType: Stock Settings,Auto Material Request,Material Auto Cerere
+DocType: Stock Settings,Auto Material Request,Auto cerere de material
DocType: Time Log,Will be updated when billed.,Vor fi actualizate atunci când facturat.
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
-DocType: Sales Invoice,Against Income Account,Împotriva Contului de Venit
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Pronunțată
+DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Livrat
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
DocType: Territory,Territory Targets,Obiective Territory
DocType: Delivery Note,Transporter Info,Info Transporter
@@ -2626,10 +2616,10 @@
apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Antete de Scrisoare de Sabloane de Imprimare.
apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titluri de șabloane de imprimare, de exemplu proforma Factura."
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
-DocType: POS Setting,Update Stock,Actualizați Stock
+DocType: POS Setting,Update Stock,Actualizare stock
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Superfinishing,Superfinisare
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.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rata
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Adauga / Editeaza </ a>"
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
apps/erpnext/erpnext/accounts/utils.py +235,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
@@ -2640,16 +2630,16 @@
DocType: Expense Claim,Total Sanctioned Amount,Suma totală sancționat
,Purchase Analytics,Analytics de cumpărare
DocType: Sales Invoice Item,Delivery Note Item,Nota de Livrare Articol
-DocType: Expense Claim,Task,Operatiune
+DocType: Expense Claim,Task,Sarcină
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Shaving,Ras
DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},Numărul lotului este obligatorie pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Aceasta este o persoană de vânzări rădăcină și nu pot fi editate.
,Stock Ledger,Stoc Ledger
DocType: Salary Slip Deduction,Salary Slip Deduction,Salariul Slip Deducerea
apps/erpnext/erpnext/stock/doctype/item/item.py +368,"To set reorder level, item must be a Purchase Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare"
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Observații:
-DocType: Opportunity,From,Din data
+apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Observații
+DocType: Opportunity,From,De la
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +192,Select a group node first.,Selectați un nod grup prim.
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Fill the form and save it,Completați formularul și salvați-l
@@ -2666,13 +2656,13 @@
DocType: Sales Invoice,Write Off,Achita
DocType: Time Log,Operation ID,Operațiunea ID
DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utilizator de sistem (login) de identitate. Dacă este setat, el va deveni implicit pentru toate formele de resurse umane."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} De la
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: de la {1}
DocType: Task,depends_on,depinde de
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +81,Opportunity Lost,Opportunity Lost
DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campurile cu Reduceri vor fi disponibile în Ordinul de Cumparare, Chitanta de Cumparare, Factura de Cumparare"
DocType: Report,Report Type,Tip de raport
apps/frappe/frappe/core/doctype/user/user.js +136,Loading,Încărcare
-DocType: BOM Replace Tool,BOM Replace Tool,Unealta de Inlocuire FDM
+DocType: BOM Replace Tool,BOM Replace Tool,Mijloc de înlocuire BOM
apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Șabloanele țară înțelept adresa implicită
apps/erpnext/erpnext/accounts/party.py +196,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Dacă vă implicati în activitatea de producție. Permite Articolului 'Este Fabricat'
@@ -2802,7 +2792,7 @@
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.","Lista taxelor importante (de exemplu, TVA, accize, acestea ar trebui să aibă nume unice) și ratele lor standard. Acesta va crea un sablon standard, pe care il veti putea edita și adăuga mai târziu."
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât 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} nu este un număr de lot valabil pentru postul {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {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.","Notă: În cazul în care plata nu se face împotriva oricărei referire, face manual Jurnal intrare."
DocType: Item,Supplier Items,Furnizor Articole
@@ -2816,7 +2806,7 @@
DocType: Hub Settings,Publish Availability,Publica Disponibilitate
apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
,Stock Ageing,Stoc Îmbătrânirea
-DocType: Purchase Receipt,Automatically updated from BOM table,Actualizate automat din tabelul BOM
+DocType: Purchase Receipt,Automatically updated from BOM table,Actualizat automat din tabelul BOM
apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}' este dezactivat
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
@@ -2828,12 +2818,12 @@
DocType: Sales Team,Contribution (%),Contribuție (%)
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,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Responsibilities,Responsabilitati
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Sablon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Șablon
DocType: Sales Person,Sales Person Name,Sales Person Nume
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Va rugam sa introduceti cel putin 1 factura în tabelul
DocType: Pricing Rule,Item Group,Grup Articol
-DocType: Task,Actual Start Date (via Time Logs),Data efectivă Start (prin timp Busteni)
-DocType: Stock Reconciliation Item,Before reconciliation,Înainte de reconciliere
+DocType: Task,Actual Start Date (via Time Logs),Data efectivă de început (prin Jurnale de Timp)
+DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
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,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
@@ -2844,7 +2834,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totală restantă Amt
DocType: Time Log Batch,Total Hours,Total ore
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Automotive
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Autopropulsat
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Concedii pentru tipul {0} au fost deja alocate pentru Angajat {1} pentru Anul Fiscal {0}
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Este necesară Articol
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,De turnare prin injecție de metal
@@ -2854,7 +2844,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,Investment Banking
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Selectați țara ta, fusul orar și valutar"
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} statut este destupate
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} este în starea Neoprit
DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,Decapare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,Turnarea în nisip
@@ -2864,7 +2854,7 @@
DocType: Newsletter,A Lead with this email id should exist,Un Lider cu acest id de e-mail ar trebui să existe
DocType: Stock Entry,From BOM,De la BOM
DocType: Time Log,Billing Rate (per hour),Rata de facturare (pe oră)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,De Baza
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Elementar
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +226,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Pentru a Data trebuie să fie aceeași ca la data de concediu de jumatate de zi
@@ -2875,19 +2865,19 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +237,"Multiple Price Rule exists with same criteria, please resolve \
conflict by assigning priority. Price Rules: {0}","Există Preț multiple articolul cu aceleași criterii, vă rugăm să rezolve conflictele \
prin atribuirea prioritate. Reguli Pret: {0}"
-DocType: Account,Bank,Banca
+DocType: Account,Bank,Bancă
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Airline,Linie aeriană
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +511,Issue Material,Eliberarea Material
DocType: Material Request Item,For Warehouse,Pentru Depozit
DocType: Employee,Offer Date,Oferta Date
DocType: Hub Settings,Access Token,Acces Token
-DocType: Sales Invoice Item,Serial No,Serial No
+DocType: Sales Invoice Item,Serial No,Nr. serie
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
DocType: Item,Is Fixed Asset Item,Este fixă Asset Postul
DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
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","Dacă aveți formate de imprimare lungi, această caracteristică poate fi folosita pentru a împărți pagina pentru imprimare pe mai multe pagini, cu toate anteturile și subsolurile de pe fiecare pagină"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,Toate Teritoriile
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,Toate teritoriile
DocType: Party Type,Party Type Name,Tip partid Nume
DocType: Purchase Invoice,Items,Articole
DocType: Fiscal Year,Year Name,An Denumire
@@ -2899,9 +2889,9 @@
DocType: Issue,Opening Time,Timp de deschidere
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
-DocType: Shipping Rule,Calculate Based On,Calculează Pe Baza
+DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Drilling,Foraj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Blow molding,Suflare
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Blow molding,Modelare prin suflare
DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și 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,"Acest post este o variantă de {0} (Template). Atributele vor fi copiate pe de modelul cu excepția cazului este setat ""Nu Copy"""
DocType: Account,Purchase User,Cumpărare de utilizare
@@ -2914,7 +2904,7 @@
DocType: Journal Entry,Print Heading,Imprimare Titlu
DocType: Quotation,Maintenance Manager,Intretinere Director
DocType: Workflow State,Search,Căutare
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totală nu poate să fie zero
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalul nu poate să fie zero
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,'Zile de la ultima comandă' trebuie să fie mai mare sau egal cu zero
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,Lipire
DocType: C-Form,Amended From,Modificat din
@@ -2930,13 +2920,13 @@
,Produced,Produs
DocType: Issue,Raised By (Email),Ridicate de (e-mail)
DocType: Email Digest,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,Atașați cu antet
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,Atașați antet
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +244,Serial Nos Required for Serialized Item {0},Serial nr necesare pentru postul serializat {0}
-DocType: Journal Entry,Bank Entry,Banca de intrare
-DocType: Authorization Rule,Applicable To (Designation),Aplicabil Pentru (destinatie)
-DocType: Blog Post,Blog Post,Postare pe Blog
-apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,Adauga in Cos
+DocType: Journal Entry,Bank Entry,Intrare bancară
+DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
+DocType: Blog Post,Blog Post,Postare blog
+apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,Adăugaţi în Coş
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupul De
apps/erpnext/erpnext/config/accounts.py +133,Enable / disable currencies.,Activare / dezactivare valute.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Cheltuieli poștale
@@ -2944,7 +2934,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,Divertisment & Relaxare
DocType: Purchase Order,The date on which recurring order will be stop,Data la care comanda recurent va fi opri
DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
-apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redusă cu {1} sau ar trebui să crească toleranța preaplin
+apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Raport Prezent
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,Oră
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +133,"Serialized Item {0} cannot be updated \
@@ -2967,18 +2957,18 @@
DocType: Quality Inspection,Report Date,Data raportului
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Routing,Rutare
DocType: C-Form,Invoices,Facturi
-DocType: Job Opening,Job Title,Denumire Loc de Muncă
+DocType: Job Opening,Job Title,Denumire post
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} Destinatari
DocType: Features Setup,Item Groups in Details,Grup Articol în Detalii
apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,Contul de Cheltuieli este obligatoriu
apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start la punctul de vânzare (POS)
-DocType: Item,A new variant (Item) will be created for each attribute value combination,O variantă nouă (punctul) va fi creat pentru fiecare combinație valoare atribut
+DocType: Item,A new variant (Item) will be created for each attribute value combination,O variantă nouă (articol) va fi creat pentru fiecare combinație valoare atribut
apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Vizitați raport de apel de întreținere.
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.,"Procentul vi se permite de a primi sau livra mai mult față de cantitatea comandata. De exemplu: Dacă ați comandat 100 de unități. și alocația este de 10%, atunci vi se permite să primească 110 de unități."
DocType: Pricing Rule,Customer Group,Grup Client
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
DocType: Item,Website Description,Site-ul Descriere
-DocType: Serial No,AMC Expiry Date,Data expirării AMC
+DocType: Serial No,AMC Expiry Date,Dată expirare AMC
,Sales Register,Vânzări Inregistrare
DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
DocType: Address,Plant,Instalarea
@@ -2988,7 +2978,7 @@
DocType: Customer Group,Customer Group Name,Nume Group Client
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
-DocType: GL Entry,Against Voucher Type,Împotriva Tipului de Voucher
+DocType: GL Entry,Against Voucher Type,Comparativ tipului de voucher
DocType: POS Setting,POS Setting,Setarea POS
DocType: Packing Slip,Get Items,Obtine Articole
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
@@ -2996,7 +2986,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +220,Make Excise Invoice,Realizeaza Factura de Accize
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Realizeaza Anexa de Impachetare
DocType: Communication,Other,Altul
-DocType: C-Form,C-Form,Forma-C
+DocType: C-Form,C-Form,Formular-C
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,ID operațiune nu este setat
DocType: Production Order,Planned Start Date,Start data planificată
DocType: Serial No,Creation Document Type,Tip de document creație
@@ -3006,20 +2996,20 @@
DocType: Leave Allocation,New Leaves Allocated,Frunze noi alocate
apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
DocType: Project,Expected End Date,Data de Incheiere Preconizata
-DocType: Appraisal Template,Appraisal Template Title,Titlu Model Expertiva
+DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +366,Commercial,Comercial
DocType: Cost Center,Distribution Id,Id distribuție
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii Extraordinare
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Toate Produsele sau Serviciile.
+apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Toate produsele sau serviciile.
DocType: Purchase Invoice,Supplier Address,Furnizor Adresa
-DocType: Contact Us Settings,Address Line 2,Adresa Linia 2
+DocType: Contact Us Settings,Address Line 2,Adresă Linie 2
DocType: ToDo,Reference,Referinta
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,Perforare
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,Out Cantitate
apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,Seria este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,Servicii Financiare
-DocType: Opportunity,Sales,Vanzari
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,Servicii financiare
+DocType: Opportunity,Sales,Vânzări
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Cr,Cr
DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
@@ -3027,7 +3017,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Laminating,Laminare
DocType: Item Reorder,Transfer,Transfer
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +567,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
-DocType: Authorization Rule,Applicable To (Employee),Aplicabil Pentru (Angajat)
+DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,Sinterizarea
DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
DocType: Naming Series,Setup Series,Seria de configurare
@@ -3050,7 +3040,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Continuous casting,Turnare continuă
sites/assets/js/erpnext.min.js +6,Please specify a,Vă rugăm să specificați un
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Realizeaza Factura de Cumparare
-DocType: Offer Letter,Awaiting Response,Asteapta raspuns
+DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Cold sizing,Dimensionarea rece
DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
@@ -3065,27 +3055,27 @@
DocType: Serial No,Creation Time,Timp de creare
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Raport Venituri
,Monthly Attendance Sheet,Lunar foaia de prezență
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,Nu au găsit înregistrări
-apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center este obligatorie pentru postul {2}
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,Nu s-au găsit înregistrări
+apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Center de Cost este obligatoriu pentru articolul {2}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,Contul {0} este inactiv
DocType: GL Entry,Is Advance,Este Advance
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Participarea la data și prezență până în prezent este obligatorie
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Prezenţa de la data și prezența până la data sunt obligatorii
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
DocType: Sales Team,Contact No.,Nr. Persoana de Contact
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' cont {0} nu este permis în ideschidere de intrare"""
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' {0} nu este permis în intrarea de deschidere"""
DocType: Workflow State,Time,Oră
DocType: Features Setup,Sales Discounts,Reduceri de vânzare
DocType: Hub Settings,Seller Country,Vânzător Țară
-DocType: Authorization Rule,Authorization Rule,Regula de autorizare
+DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
DocType: Sales Invoice,Terms and Conditions Details,Termeni și condiții Detalii
apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,Specificaţii:
DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impozite vânzări și șabloane Taxe
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,Îmbrăcăminte și accesorii
DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.",
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,Numărul de Comanda
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,Numărul de comandă
DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, care va arăta pe partea de sus a listei de produse."
DocType: Shipping Rule,Specify conditions to calculate shipping amount,Precizați condițiile de calcul cantitate de transport maritim
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Adăuga copil
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Adăugaţi fiu
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolul pot organiza conturile înghețate și congelate Editați intrările
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Cannot convert Cost Center to ledger as it has child nodes,"Nu se poate converti de cost Centrul de registru, deoarece are noduri copil"
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,Factorul de Conversie este necesar
@@ -3094,7 +3084,7 @@
DocType: Offer Letter Term,Value / Description,Valoare / Descriere
,Customers Not Buying Since Long Time,Clienții care nu au efectuat cumparaturi de foarte mult timp
DocType: Production Order,Expected Delivery Date,Data de Livrare Preconizata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Bulging,Bombat
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Bulging,Lărgire
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Evaporative-pattern casting,Turnare evaporare-model
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Cheltuieli de Divertisment
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +176,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
@@ -3106,10 +3096,10 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Cheltuieli Juridice
DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Zi a lunii în care comanda automat va fi generat de exemplu 05, 28 etc"
DocType: Sales Invoice,Posting Time,Postarea de timp
-DocType: Sales Order,% Amount Billed,% Suma facturată
+DocType: Sales Order,% Amount Billed,% Sumă facturată
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Cheltuieli de telefon
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} numere de serie necesare pentru postul {0}. Numai {0} furnizate.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} numere de serie necesare pentru articolul {0}. Au fost furnizate doar {0}.
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.,"Bifati dacă doriți sa fortati utilizatorul să selecteze o serie înainte de a salva. Nu va exista nici o valoare implicita dacă se bifeaza aici."""
apps/erpnext/erpnext/stock/get_item_details.py +108,No Item with Serial No {0},Nici un articol cu ordine {0}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Cheltuieli Directe
@@ -3124,7 +3114,7 @@
DocType: Serial No,"Only Serial Nos with status ""Available"" can be delivered.","Numai Serial nr cu statutul ""Disponibile"", pot fi livrate."
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +53,Probation,Probă
apps/erpnext/erpnext/stock/doctype/item/item.py +94,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
-DocType: Feed,Full Name,Nume Complet
+DocType: Feed,Full Name,Nume complet
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Clinching,Concludent
apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +188,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
@@ -3140,12 +3130,12 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +190,Item Variants {0} created,Postul variante {0} creat
apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tip de frunze, cum ar fi casual, bolnavi, etc"
DocType: Email Digest,Send regular summary reports via Email.,Trimite rapoarte de sinteză periodice prin e-mail.
-DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adauga linii pentru a stabili bugete anuale pentru Conturi.
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adaugaţi rânduri pentru a stabili bugete anuale pentru Conturi.
DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Quarrying,Cariere
DocType: Production Order,Total Operating Cost,Cost total de operare
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +153,Note: Item {0} entered multiple times,Notă: Articol {0} a intrat de mai multe ori
-apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Toate persoanele de contact.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +153,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Toate contactele.
DocType: Newsletter,Test Email Id,Test de e-mail Id-ul
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Abbreviation,Abreviere Companie
DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,In cazul in care urmați Inspecție de calitate. Activeaza Articol QA solicitat și nr. QA din Chitanta de Cumparare
@@ -3164,11 +3154,11 @@
apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Toate Grupurile de Clienți
-apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatorie. Poate înregistrare de schimb valutar nu este creat pentru {1} la {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Contul {0}: cont Părinte {1} nu există
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',"{0} {1} statut este ""Oprit"""
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} este în starea 'Oprit'
DocType: Account,Temporary,Temporar
DocType: Address,Preferred Billing Address,Adresa de facturare preferat
DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
@@ -3178,7 +3168,7 @@
DocType: Pricing Rule,Buying,Cumpărare
DocType: HR Settings,Employee Records to be created by,Inregistrari Angajaților pentru a fi create prin
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Acest lot Timpul Log a fost anulat.
-DocType: Purchase Invoice,Apply Discount On,Aplicați Discount On
+DocType: Purchase Invoice,Apply Discount On,Aplicați Discount pentru
DocType: Salary Slip Earning,Salary Slip Earning,Salariul Slip Câștigul salarial
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditorii
DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detaliu Taxa Avizata Articol
@@ -3187,8 +3177,8 @@
DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,Calcat
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} este oprit
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru Articolul {1}
-DocType: Lead,Add to calendar on this date,Adauga la calendar in această dată
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+DocType: Lead,Add to calendar on this date,Adăugaţi în calendar la această dată
apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Clientul este necesar
DocType: Letter Head,Letter Head,Antet Scrisoare
@@ -3207,10 +3197,10 @@
DocType: Hub Settings,Name Token,Numele Token
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Planing,"Masini pentru dimensionat,"
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Selling,Vanzarea Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,Cel putin un antrepozit este obligatorie
-DocType: Serial No,Out of Warranty,Din garanție
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
+DocType: Serial No,Out of Warranty,Ieșit din garanție
DocType: BOM Replace Tool,Replace,Înlocuirea
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} împotriva Vanzari factură {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
DocType: Purchase Invoice Item,Project Name,Denumirea proiectului
DocType: Workflow State,Edit,Editare
@@ -3220,7 +3210,7 @@
DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliere de plata
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Active fiscale
-DocType: BOM Item,BOM No,Nr. FDM
+DocType: BOM Item,BOM No,Nr. BOM
DocType: Contact Us Settings,Pincode,Parola așa
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,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
DocType: Item,Moving Average,Mutarea medie
@@ -3235,14 +3225,14 @@
DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Pentru a atribui această problemă, utilizați butonul ""Assign"" în bara laterală."
DocType: Stock Settings,Freeze Stocks Older Than [Days],Blocheaza Stocurile Mai Vechi De [zile]
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.","În cazul în care două sau mai multe reguli de stabilire a prețurilor sunt găsite bazează pe condițiile de mai sus, se aplică prioritate. Prioritatea este un număr între 0 și 20 în timp ce valoarea implicită este zero (gol). Numărul mai mare înseamnă că va avea prioritate în cazul în care există mai multe norme de stabilire a prețurilor, cu aceleași condiții."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,Against Invoice,Împotriva factură
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,Against Invoice,Comparativ facturii
apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anul fiscal: {0} nu există
DocType: Currency Exchange,To Currency,Pentru a valutar
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permite urmatorilor utilizatori să aprobe cererile de concediu pentru zile blocate.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permiteţi următorilor utilizatori să aprobe cereri de concediu pentru zile blocate.
apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Tipuri de cheltuieli de revendicare.
DocType: Item,Taxes,Impozite
DocType: Project,Default Cost Center,Cost Center Implicit
-DocType: Purchase Invoice,End Date,Data de Incheiere
+DocType: Purchase Invoice,End Date,Dată finalizare
DocType: Employee,Internal Work History,Istoria interne de lucru
DocType: DocField,Column Break,Coloana Break
DocType: Event,Thursday,Joi
@@ -3258,7 +3248,7 @@
,Sales Order Trends,Vânzări Ordine Tendințe
DocType: Employee,Held On,Organizat In
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +24,Production Item,Producția Postul
-,Employee Information,Informații Angajat
+,Employee Information,Informații angajat
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,Data de Incheiere An Financiar
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
@@ -3273,16 +3263,16 @@
DocType: Batch,Batch ID,ID-ul lotului
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},Notă: {0}
,Delivery Note Trends,Tendințe Nota de Livrare
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un element Achiziționat sau subcontractate în rândul {1}
-apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,Cont: {0} poate fi actualizat doar prin tranzacții stoc
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un articol cumpărat sau subcontractat în rândul {1}
+apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin tranzacții de stoc
DocType: GL Entry,Party,Grup
DocType: Sales Order,Delivery Date,Data de Livrare
-DocType: DocField,Currency,Valuta
+DocType: DocField,Currency,Valută
DocType: Opportunity,Opportunity Date,Oportunitate Data
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +10,To Bill,Pentru a Bill
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Piecework,Muncă în acord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Poz. Rata de cumparare
-DocType: Task,Actual Time (in Hours),Timpul Actual (în ore)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Rată de cumparare medie
+DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
DocType: Employee,History In Company,Istoric In Companie
DocType: Address,Shipping,Transport
DocType: Stock Ledger Entry,Stock Ledger Entry,Stoc Ledger intrare
@@ -3297,7 +3287,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Conturi temporare
DocType: Payment Tool,Column Break 1,Coloana Break 1
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Negru
-DocType: BOM Explosion Item,BOM Explosion Item,Explozie Articol FDM
+DocType: BOM Explosion Item,BOM Explosion Item,Explozie articol BOM
DocType: Account,Auditor,Auditor
DocType: Purchase Order,End date of current order's period,Data de încheiere a perioadei ordin curent
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Face Scrisoare Oferta
@@ -3313,19 +3303,19 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine companiei {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Finisare ax
-DocType: Material Request,% of materials ordered against this Material Request,% din materialele comandate comparativ cu aceasta Cerere de Materiale
+DocType: Material Request,% of materials ordered against this Material Request,% din materialele comandate comparativ cu această cerere de material
DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
-DocType: Account,Asset,Asset
+DocType: Account,Asset,Valoare
DocType: Project Task,Task ID,Sarcina ID
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""MC""","de exemplu ""MC """
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +75,Stock cannot exist for Item {0} since has variants,Stock nu poate exista pentru postul {0} deoarece are variante
,Sales Person-wise Transaction Summary,Persoana de vânzări-înțelept Rezumat Transaction
DocType: System Settings,Time Zone,Time Zone
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Depozit {0} nu există
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Depozitul {0} nu există
apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inregistreaza-te pentru ERPNext Hub
DocType: Monthly Distribution,Monthly Distribution Percentages,Procente de distribuție lunare
apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% din materialele livrate comparativ cu această Nota de Livrare
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% din materialele livrate comparativ cu această notă de Livrare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stapling,Capsare
DocType: Customer,Customer Details,Detalii Client
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Shaping,Modelarea
@@ -3333,27 +3323,27 @@
DocType: SMS Settings,Enter url parameter for receiver nos,Introduceți parametru url pentru receptor nos
DocType: Sales Invoice,Paid Amount,Suma plătită
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Inchiderea Contului {0} trebuie să fie de tip 'Răspundere'
-,Available Stock for Packing Items,Stoc Disponibil pentru Articole pentru Impachetare
+,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Reserved Warehouse is missing in Sales Order,Rezervat Warehouse lipsește în comandă de vânzări
DocType: Item Variant,Item Variant,Postul Varianta
apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
-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'","Soldul contului este deja în Debit, nu poţi seta ""Balanța trebuie să fie"" drept ""Credit""."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Quality Management,Managementul calitatii
+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'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Quality Management,Managementul calității
DocType: Production Planning Tool,Filter based on customer,Filtru bazat pe client
-DocType: Payment Tool Detail,Against Voucher No,Împotriva Voucher nr
+DocType: Payment Tool Detail,Against Voucher No,Comparativ voucherului nr
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +46,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Atenție: comandă de vânzări {0} există deja în număr aceeași comandă de aprovizionare
DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
DocType: Notification Control,Purchase,Cumpărarea
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Starea de {0} {1} este acum {2}
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,Cant. de Echilibru
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,Cantitate de bilanţ
DocType: Item Group,Parent Item Group,Părinte Grupa de articole
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} pentru {1}
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,Centre de cost
apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Depozite.
DocType: Purchase Order,Rate at which supplier's currency is converted to company's base currency,Rata la care moneda furnizorului este convertit în moneda de bază a companiei
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rând # {0}: conflicte timpilor cu rândul {1}
-DocType: Employee,Employment Type,Tip Angajare
+DocType: Employee,Employment Type,Tip angajare
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Active Fixe
DocType: Item Group,Default Expense Account,Cont de Cheltuieli Implicit
DocType: Employee,Notice (days),Preaviz (zile)
@@ -3361,27 +3351,27 @@
DocType: Cost Center,Material User,Utilizator Material
DocType: Employee,Encashment Date,Data plata in Numerar
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","Împotriva Voucher Tipul trebuie să fie una de Ordinului de Procurare, cumparare factură sau Jurnal intrare"
+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","Comparativ tipului de voucher trebuie să fie o opțiune dintre următoarele: ordin de cumparare, factură de cumpărare sau intrare în jurnal"
DocType: Account,Stock Adjustment,Ajustarea stoc
DocType: Production Order,Planned Operating Cost,Planificate cost de operare
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Noul {0} Nume
apps/erpnext/erpnext/controllers/recurring_document.py +126,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
DocType: Global Defaults,jsonrates.com API Key,jsonrates.com API Key
-DocType: Job Applicant,Applicant Name,Nume Solicitant
-DocType: Authorization Rule,Customer / Item Name,Client / Denumire Articol
+DocType: Job Applicant,Applicant Name,Nume solicitant
+DocType: Authorization Rule,Customer / Item Name,Client / Denumire articol
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Nu serial este obligatorie pentru postul {0}
sites/assets/js/desk.min.js +536,Created By,Creat de
DocType: Serial No,Under AMC,Sub AMC
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Rata de evaluare Articolul este recalculat în vedere aterizat sumă voucher de cost
apps/erpnext/erpnext/config/selling.py +65,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
DocType: BOM Replace Tool,Current BOM,FDM curent
-sites/assets/js/erpnext.min.js +5,Add Serial No,Adauga Nr. de Serie
+sites/assets/js/erpnext.min.js +5,Add Serial No,Adăugaţi Nr. de Serie
DocType: Production Order,Warehouses,Depozite
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimare și staționare
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,Nod Group
DocType: Payment Reconciliation,Minimum Amount,Suma minima
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,Marfuri actualizare finite
-DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Setați automat. În cazul în care acest element are variante, atunci aceasta nu poate fi selectat în comenzile de vânzări, etc."
+DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Setați automat. În cazul în care nu există variante ale acestui element, aceasta nu poate fi selectat în comenzile de vânzări, etc."
DocType: Workstation,per hour,pe oră
apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},Series {0} folosit deja în {1}
DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Contul aferent depozitului (Inventar Permanent) va fi creat in cadrul acest Cont.
@@ -3395,7 +3385,7 @@
DocType: Sales Invoice,Supplier Reference,Furnizor de referință
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.","In cazul in care se bifeaza, FDM pentru un articol sub-asamblare va fi luat în considerare pentru obținere materii prime. În caz contrar, toate articolele de sub-asamblare vor fi tratate ca si materie primă."
DocType: Material Request,Material Issue,Problema de material
-DocType: Hub Settings,Seller Description,Vânzător Descriere
+DocType: Hub Settings,Seller Description,Descriere vânzător
DocType: Item,Is Stock Item,Este Stock Articol
DocType: Shopping Cart Price List,Shopping Cart Price List,Lista de cumpărături Coș de prețuri
DocType: Employee Education,Qualification,Calificare
@@ -3404,7 +3394,7 @@
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,Ordonat
DocType: Company,Default Settings,Setări Implicite
-DocType: Warehouse,Warehouse Name,Depozit Denumire
+DocType: Warehouse,Warehouse Name,Denumire depozit
DocType: Naming Series,Select Transaction,Selectați Transaction
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vă rugăm să introduceți Aprobarea Rolul sau aprobarea de utilizare
DocType: Journal Entry,Write Off Entry,Amortizare intrare
@@ -3424,10 +3414,10 @@
DocType: Sales Order Item,For Production,Pentru Producție
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +107,Please enter sales order in the above table,Vă rugăm să introduceți comenzi de vânzări în tabelul de mai sus
DocType: Project Task,View Task,Vezi Sarcina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,An dvs. financiar începe la data de
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,Anul dvs. financiar începe la data de
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Va rugam sa introduceti cumparare Încasări
DocType: Sales Invoice,Get Advances Received,Obtine Avansurile Primite
-DocType: Email Digest,Add/Remove Recipients,Adauga / Sterge Destinatari
+DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurare de server de intrare pentru suport de e-mail id. (De exemplu support@example.com)
@@ -3436,7 +3426,7 @@
DocType: Salary Slip,Salary Slip,Salariul Slip
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Lustruire
DocType: Features Setup,To enable <b>Point of Sale</b> view,Pentru a permite <b> Point of Sale </ b> de vedere
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Pana la Data' este necesară
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Până la data' este necesară
DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generarea de ambalare slip pentru pachetele de a fi livrate. Folosit pentru a notifica numărul pachet, conținutul pachetului și greutatea sa."
DocType: Sales Invoice Item,Sales Order Item,Comandă de vânzări Postul
DocType: Salary Slip,Payment Days,Zile de plată
@@ -3446,7 +3436,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Hot rolling,Laminarea la cald
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.","Atunci când oricare dintre tranzacțiile verificate sunt ""Trimis"", un e-mail de tip pop-up a deschis în mod automat pentru a trimite un e-mail la ""Contact"", asociat în această operațiune, cu tranzacția ca un atașament. Utilizatorul poate sau nu poate trimite e-mail."
apps/erpnext/erpnext/config/setup.py +101,Customer master.,Director Client.
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Setari Globale
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Setări globale
DocType: Employee Education,Employee Education,Educație Angajat
DocType: Salary Slip,Net Pay,Plată netă
DocType: Account,Account,Cont
@@ -3458,7 +3448,7 @@
apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potențiale oportunități de vânzare.
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Sick Leave,A concediului medical
DocType: Email Digest,Email Digest,Email Digest
-DocType: Delivery Note,Billing Address Name,Numele din Adresa de facturare
+DocType: Delivery Note,Billing Address Name,Numele din adresa de facturare
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Department Stores,Magazine Departament
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +39,System Balance,Sistemul Balanța
DocType: Workflow,Is Active,Este activ
@@ -3468,28 +3458,28 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Linishing,Linishing
DocType: Company,Change Abbreviation,Schimbarea abreviere
DocType: Workflow State,Primary,Principal:
-DocType: Expense Claim Detail,Expense Date,Data Cheltuiala
+DocType: Expense Claim Detail,Expense Date,Data cheltuieli
DocType: Item,Max Discount (%),Max Discount (%)
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +60,Last Order Amount,Ultima cantitate
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Blasting,Sablare
DocType: Company,Warn,Avertiza
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +82,Item valuation updated,Evaluare Articol Actualizata
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, de efort demn de remarcat faptul că ar trebui să meargă în înregistrările."
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
DocType: BOM,Manufacturing User,Producție de utilizare
DocType: Purchase Order,Raw Materials Supplied,Materii prime furnizate
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}),Raport de evaluare ({0}) pentru fabricat sau reambalate produs (e) nu poate fi mai mică de evaluare numărul total de materii prime ({1})
DocType: Email Digest,New Projects,Proiecte noi
-DocType: Communication,Series,Serie
+DocType: Communication,Series,Serii
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Cumparare
-DocType: Appraisal,Appraisal Template,Model Expertiza
+DocType: Appraisal,Appraisal Template,Model expertiză
DocType: Communication,Email,Email
DocType: Item Group,Item Classification,Postul Clasificare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Manager de Dezvoltarea Afacerilor
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scop Vizita Mentenanta
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Perioada
,General Ledger,Registru Contabil General
apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vezi Oportunitati
-DocType: Item Attribute Value,Attribute Value,Atribut Valoare
+DocType: Item Attribute Value,Attribute Value,Valoare Atribut
apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Id Email trebuie să fie unic, există deja pentru {0}"
,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +216,Please select {0} first,Vă rugăm selectați 0} {întâi
@@ -3497,7 +3487,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Redrawing,Retrasarea
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Etching,Gravură
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +55,Commission,Comision
-apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,Nu este permis să răspundă la această bilet.
+apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,Nu vi se permite să răspundeți la aceast tichet.
DocType: Address Template,"<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>
@@ -3525,17 +3515,17 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
DocType: Quality Inspection Reading,Quality Inspection Reading,Inspecție de calitate 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.,`Blocheaza Stocuri mai în vârstă decât` ar trebui să fie mai mică decât% d zile.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic decât %d zile.
,Project wise Stock Tracking,Proiect înțelept Tracking Stock
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Programul de Mentenanta {0} există comparativ cu {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Cant Efectiva (la sursă / țintă)
+DocType: Stock Entry Detail,Actual Qty (at source/target),Cant efectivă (la sursă/destinaţie)
DocType: Item Customer Detail,Ref Code,Cod de Ref
apps/erpnext/erpnext/config/hr.py +13,Employee records.,Înregistrări angajat.
DocType: HR Settings,Payroll Settings,Setări de salarizare
apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
DocType: Email Digest,New Purchase Orders,Noi comenzi de aprovizionare
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Root cannot have a parent cost center,Rădăcină nu poate avea un centru de cost părinte
-DocType: Sales Invoice,C-Form Applicable,Forma-C aplicabila
+DocType: Sales Invoice,C-Form Applicable,Formular-C aplicabil
DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +476,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
@@ -3543,12 +3533,12 @@
DocType: Warranty Claim,Resolved By,Rezolvat prin
DocType: Appraisal,Start Date,Data începerii
sites/assets/js/desk.min.js +512,Value,Valoare
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Aloca concedii pentru o perioadă.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,Contul {0}: Nu se poate atribui drept cont părinte
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocaţi concedii pentru o perioadă.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
DocType: Purchase Invoice Item,Price List Rate,Lista de prețuri Rate
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,Nr. de serie livrat {0} nu poate fi ștears
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Arata ""Pe stoc"" sau ""nu este pe stoc"", bazat pe stoc disponibil în acest depozit."
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Factura de materiale (FDM)
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Factură de materiale (BOM)
DocType: Time Log,Hours,Ore
DocType: Project,Expected Start Date,Data de Incepere Preconizata
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Rolling,Rulare
@@ -3556,7 +3546,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +168,"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","Nu se poate șterge Nr. Serial {0} în stoc. Mai întâi scoateti din stoc, apoi ștergeți."
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminați element cazul în care costurile nu se aplică în acest element
DocType: Backup Manager,Dropbox Access Allowed,Acces Dropbox Permis
-DocType: Backup Manager,Weekly,Saptamanal
+DocType: Backup Manager,Weekly,Săptămânal
DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
DocType: Maintenance Visit,Fully Completed,Completat in Intregime
DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Produsele vor fi clasificate în funcție de greutate, vârstă în căutări implicite. Mai mult greutate de vârstă, mai mare produsul va apărea în listă."
@@ -3575,7 +3565,7 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +73,Stock Ledger entries balances updated,Stoc Ledger intrări solduri actualizate
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,Adăugați / Editați Preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,Adăugați / editați preturi
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,Grafic Centre de Cost
,Requested Items To Be Ordered,Elemente solicitate să fie comandate
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,Comenzile mele
@@ -3590,13 +3580,13 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Finalizare
-DocType: Purchase Invoice Item,Amount (Company Currency),Suma (Compania de valuta)
+DocType: Purchase Invoice Item,Amount (Company Currency),Sumă (monedă companie)
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,Turnarea
DocType: Email Alert,Reference Date,Data de referință
apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitate de organizare (departament) maestru.
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Va rugam sa introduceti nos mobile valabile
DocType: Email Digest,User Specific,Utilizatorul specifică
-DocType: Budget Detail,Budget Detail,Detaliu Buget
+DocType: Budget Detail,Budget Detail,Detaliu buget
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +73,Please enter message before sending,Vă rugăm să introduceți mesajul înainte de trimitere
DocType: Communication,Status,Stare
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +36,Stock UOM updated for Item {0},Stoc UOM actualizate pentru postul {0}
@@ -3617,17 +3607,17 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
DocType: Naming Series,Help HTML,Ajutor HTML
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
-apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},Reduceri pentru mai mult de-{0} a trecut pentru postul {1}
+apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
DocType: Address,Name of person or organization that this address belongs to.,Nume de persoană sau organizație care această adresă aparține.
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,Furnizorii dumneavoastră
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
-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.,"Un alt Structura Salariul {0} este activ pentru angajati {1}. Vă rugăm să faceți statutul de ""inactive"" pentru a continua."
+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.,"O altă structură salarială {0} este activă pentru angajatul {1}. Vă rugăm să îi setaţi statusul ""inactiv"" pentru a continua."
DocType: Purchase Invoice,Contact,Persoana de Contact
DocType: Features Setup,Exports,Exporturi
DocType: Lead,Converted,Transformat
-DocType: Item,Has Serial No,Are Numar de Serie
+DocType: Item,Has Serial No,Are nr. de serie
DocType: Employee,Date of Issue,Data Problemei
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: De la {0} pentru {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: de la {0} pentru {1}
DocType: Issue,Content Type,Tip Conținut
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Computer,Computer
DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
@@ -3641,9 +3631,9 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it do?,Ce face?
DocType: Delivery Note,To Warehouse,Pentru Warehouse
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Contul {0} a fost introdus de mai multe ori pentru anul fiscal {1}
-,Average Commission Rate,Rata de Comision Medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"'Are Numarul de Serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc"""
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Spectatori nu pot fi marcate pentru date viitoare
+,Average Commission Rate,Rată de comision medie
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,'Are numarul de serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
DocType: Price List,"Specify a list of Territories, for which, this Price List is valid","Specificați o listă de teritorii, pentru care, aceasta lista de prețuri este valabilă"
@@ -3655,8 +3645,8 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Peening,Prelucrare stropire
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la garanție revendicarea
DocType: Stock Entry,Default Source Warehouse,Depozit Sursa Implicit
-DocType: Item,Customer Code,Cod Client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +203,Birthday Reminder for {0},Data nasterii Reminder pentru {0}
+DocType: Item,Customer Code,Cod client
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +203,Birthday Reminder for {0},Memento dată naştere pentru {0}
DocType: Item,Default Purchase Account in which cost of the item will be debited.,Cont Achizitii Implicit din care costul articolului va fi debitat.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Lapping,Lepuit
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Zile de la ultima comandă
@@ -3675,9 +3665,9 @@
,Ordered Qty,Ordonat Cantitate
DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitatea de proiect / sarcină.
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Genereaza fluturase de salariu
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} nu este un id-ul de e-mail validă
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","De cumpărare trebuie să fie verificate, dacă este cazul Pentru este selectat ca {0}"
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generează fluturașe de salariu
+apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} nu este un id de email valid
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Destinat Cumpărării trebuie să fie bifat, dacă Se Aplica Pentru este selectat ca şi {0}"
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
DocType: ToDo,Low,Scăzut
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Spinning,Spinning
@@ -3692,13 +3682,13 @@
DocType: Employee External Work History,Salary,Salariu
DocType: Serial No,Delivery Document Type,Tip Document de Livrare
DocType: Salary Manager,Submit all salary slips for the above selected criteria,Să prezinte toate fișele de salariu pentru criteriile selectate de mai sus
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Articole sincronizate
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} articole sincronizate
DocType: Sales Order,Partly Delivered,Parțial livrate
DocType: Sales Invoice,Existing Customer,Client Existent
DocType: Email Digest,Receivables,Creanțe
DocType: Quality Inspection Reading,Reading 5,Lectură 5
DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Introduceți e-mail id separate prin virgula, ordin vor fi expediate în mod automat pe anumită dată"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Numele Campaniei este necesară
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Denumirea campaniei este necesară
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,Rotunjite
DocType: Maintenance Visit,Maintenance Date,Data Mentenanta
DocType: Purchase Receipt Item,Rejected Serial No,Respins de ordine
@@ -3711,11 +3701,11 @@
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.","Exemplu:. ABCD #####
Dacă seria este setat și nu de serie nu este menționat în tranzacții, numărul de atunci automat de serie va fi creat pe baza acestei serii. Dacă întotdeauna doriți să se menționeze explicit Serial nr de acest articol. părăsi acest gol."
DocType: Upload Attendance,Upload Attendance,Încărcați Spectatori
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,BOM și Producție Cantitate sunt necesare
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama Îmbătrânirea 2
-DocType: Journal Entry Account,Amount,Suma
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
+DocType: Journal Entry Account,Amount,Sumă
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Riveting,Nituire
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,FDM înlocuit
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
,Sales Analytics,Analytics de vânzare
DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master
@@ -3730,7 +3720,7 @@
DocType: Notification Control,Prompt for Email on Submission of,Prompt de e-mail pe Depunerea
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} este necesară
+apps/frappe/frappe/model/naming.py +40,{0} is required,{0} este necesar
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Turnare sub vid
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,Data Preconizata nu poate fi anterioara Datei Cererii de Materiale
DocType: Contact Us Settings,City,Oraș
@@ -3744,13 +3734,13 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
DocType: Sales Partner,Partner Type,Tip partener
DocType: Purchase Taxes and Charges,Actual,Efectiv
-DocType: Purchase Order,% of materials received against this Purchase Order,% din materialele primite comparativ cu acest Ordin de Plata
+DocType: Purchase Order,% of materials received against this Purchase Order,% din materialele recepționate comparativ cu această comandă de cumparare
DocType: Authorization Rule,Customerwise Discount,Reducere Client
-DocType: Purchase Invoice,Against Expense Account,Împotriva Contului de Cheltuieli
+DocType: Purchase Invoice,Against Expense Account,Comparativ contului de cheltuieli
DocType: Production Order,Production Order,Număr Comandă Producţie:
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +242,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
-DocType: Quotation Item,Against Docname,Împotriva Denumirii Documentului
-DocType: SMS Center,All Employee (Active),Toti Angajatii (Activi)
+DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
+DocType: SMS Center,All Employee (Active),Toți angajații (activi)
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selectați perioada în care factura va fi generat automat
DocType: BOM,Raw Material Cost,Materie primă Cost
@@ -3758,7 +3748,7 @@
DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
sites/assets/js/list.min.js +160,Gantt Chart,Diagrama Gantt
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,Part-time
-DocType: Employee,Applicable Holiday List,Lista de Vacanta Aplicabila
+DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
DocType: Employee,Cheque,Cheque
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,Seria Actualizat
apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Report Type is mandatory,Tip de raport este obligatorie
@@ -3789,10 +3779,10 @@
DocType: Purchase Taxes and Charges,On Net Total,Pe net total
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,Depozit țintă în rândul {0} trebuie să fie același ca și de producție de comandă
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""notificare Adresele de email"" nu sunt specificate pentru recurente% s"
+apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,Frezare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,Muste
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Cheltuieli Administrative
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,Ciugulit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Cheltuieli administrative
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Consulting,Consilia
DocType: Customer Group,Parent Customer Group,Părinte Client Group
sites/assets/js/erpnext.min.js +45,Change,Schimbare
@@ -3805,60 +3795,60 @@
apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Acesta este un teritoriu rădăcină și nu pot fi editate.
DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
DocType: Email Digest,Receivables / Payables,Creanțe / Datorii
-DocType: Journal Entry Account,Against Sales Invoice,Împotriva Facturii de Vanzari
+DocType: Journal Entry Account,Against Sales Invoice,Comparativ facturii de vânzări
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Stamping,Ștanțare
DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afiseaza valorile nule
DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantitatea de produs obținut după fabricarea / reambalare de la cantități date de materii prime
DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
-DocType: Delivery Note Item,Against Sales Order Item,Împotriva comandă de vânzări Postul
+DocType: Delivery Note Item,Against Sales Order Item,Comparativ articolului comenzii de vânzări
DocType: Item,Default Warehouse,Depozit Implicit
-DocType: Task,Actual End Date (via Time Logs),Actual Data de încheiere (prin Ora Busteni)
+DocType: Task,Actual End Date (via Time Logs),Dată efectivă de sfârşit (prin Jurnale de Timp)
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,Vă rugăm să introduceți centru de cost părinte
DocType: Delivery Note,Print Without Amount,Imprima Fără Suma
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,"Taxa Categoria nu poate fi ""de evaluare"" sau ""de evaluare și total"", ca toate elementele sunt produse non-stoc"
DocType: User,Last Name,Nume
DocType: Web Page,Left,Stânga
-DocType: Event,All Day,Toata Ziua
+DocType: Event,All Day,Toată ziua
DocType: Communication,Support Team,Echipa de Suport
DocType: Appraisal,Total Score (Out of 5),Scor total (din 5)
DocType: Contact Us Settings,State,Stat
DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,Balanța
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,Bilanţ
DocType: Project,Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont)
DocType: User,Gender,Sex
DocType: Journal Entry,Debit Note,Nota de Debit
-DocType: Stock Entry,As per Stock UOM,Ca pe Stoc UOM
+DocType: Stock Entry,As per Stock UOM,Ca şi pentru stoc UOM
apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nu expirat
-DocType: Journal Entry,Total Debit,Totală de debit
+DocType: Journal Entry,Total Debit,Total debit
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Persoana de vânzări
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +496,Unstop Purchase Order,Unstop Comandă
DocType: Sales Invoice,Cold Calling,Apelare Rece
DocType: SMS Parameter,SMS Parameter,SMS Parametru
DocType: Maintenance Schedule Item,Half Yearly,Semestrial
-DocType: Lead,Blog Subscriber,Abonat Blog
+DocType: Lead,Blog Subscriber,Abonat blog
DocType: Email Digest,Income Year to Date,Venituri Anul curent
apps/erpnext/erpnext/config/setup.py +58,Create rules to restrict transactions based on values.,Creare reguli pentru restricționare tranzacții bazate pe valori.
DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","In cazul in care se bifeaza, nr. total de zile lucratoare va include si sarbatorile, iar acest lucru va reduce valoarea Salariul pe Zi"
DocType: Purchase Invoice,Total Advance,Total de Advance
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +543,Unstop Material Request,Unstop Material Cerere
DocType: Workflow State,User,Utilizator
-DocType: Opportunity Item,Basic Rate,Rata de bază
+DocType: Opportunity Item,Basic Rate,Rată elementară
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +122,Set as Lost,Setați ca Lost
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +57,Stock balances updated,Solduri stoc actualizate
DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Menține Aceeași Rată in Cursul Ciclului de Vânzări
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},Nu se pot returna mai mult de {0} pentru Articolul {1}
DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planificați busteni de timp în afara orelor de lucru de lucru.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} a fost deja prezentat
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} a fost deja introdus
,Items To Be Requested,Articole care vor fi solicitate
DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
DocType: Company,Company Info,Informatii Companie
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Seaming,Fălțuire
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicatie a fondurilor (Activelor)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
DocType: Production Planning Tool,Filter based on item,Filtru bazata pe articol
DocType: Fiscal Year,Year Start Date,An Data începerii
-DocType: Attendance,Employee Name,Nume Angajat
+DocType: Attendance,Employee Name,Nume angajat
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit To account must be a liability account,Debit cont trebuie să fie un cont pasiv
DocType: Sales Invoice,Rounded Total (Company Currency),Rotunjite total (Compania de valuta)
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
@@ -3866,17 +3856,17 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,Din Oportunitate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficiile angajaților
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Înnegrire
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficiile angajatului
DocType: Sales Invoice,Is POS,Este POS
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +224,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
DocType: Production Order,Manufactured Qty,Produs Cantitate
DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturi cu valoarea ridicata pentru clienți.
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
DocType: DocField,Default,Implicit
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Selectând ""Da"", va permite acest articol să apară în cumparare Ordine, Primirea de cumparare."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonați adăugat
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonați adăugați
DocType: Maintenance Schedule,Schedule,Program
DocType: Account,Parent Account,Contul părinte
DocType: Serial No,Available,Disponibil
@@ -3887,7 +3877,7 @@
DocType: Pricing Rule,Price,Preț
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selectând ""Da"", va da o identitate unică pentru fiecare entitate din acest articol, care poate fi vizualizat în ordine maestru."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creata pentru Angajatul {1} in intervalul de timp dat
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
DocType: Employee,Education,Educație
DocType: Selling Settings,Campaign Naming By,Campanie denumita de
DocType: Employee,Current Address Is,Adresa Actuală Este
@@ -3898,7 +3888,7 @@
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pentru a crea un cont fiscală
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +227,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
DocType: Account,Stock,Stoc
-DocType: Employee,Current Address,Adresa Actuala
+DocType: Employee,Current Address,Adresa actuală
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","Dacă elementul este o variantă de un alt element atunci descriere, imagine, de stabilire a prețurilor, impozite etc vor fi stabilite de șablon dacă nu se specifică în mod explicit"
DocType: Serial No,Purchase / Manufacture Details,Detalii de cumpărare / Fabricarea
DocType: Employee,Contract End Date,Data de Incheiere Contract
@@ -3908,17 +3898,17 @@
DocType: DocShare,Document Type,Tip Document
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +558,From Supplier Quotation,Din Furnizor de Ofertă
DocType: Deduction Type,Deduction Type,Tip Deducerea
-DocType: Attendance,Half Day,Jumătate de Zi
+DocType: Attendance,Half Day,Jumătate de zi
DocType: Serial No,Not Available,Indisponibil
DocType: Pricing Rule,Min Qty,Min Cantitate
-DocType: GL Entry,Transaction Date,Tranzacție Data
+DocType: GL Entry,Transaction Date,Data tranzacției
DocType: Production Plan Item,Planned Qty,Planificate Cantitate
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +92,Total Tax,Taxa totală
DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
DocType: Notification Control,Purchase Receipt Message,Primirea de cumpărare Mesaj
-DocType: Production Order,Actual Start Date,Data de Inceput Efectivă
-DocType: Sales Order,% of materials delivered against this Sales Order,% din materialele livrate comparativ cu acest Ordin de Vânzări
+DocType: Production Order,Actual Start Date,Dată Efectivă de Început
+DocType: Sales Order,% of materials delivered against this Sales Order,% din materialele livrate comparativ cu această comandă de vânzări
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Mișcare element înregistrare.
DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Listă Abonat
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Mortezat
@@ -3927,9 +3917,9 @@
DocType: Project,Gross Margin %,Marja Bruta%
DocType: BOM,With Operations,Cu Operațiuni
,Monthly Salary Register,Salariul lunar Inregistrare
-apps/frappe/frappe/website/template.py +120,Next,Urmatorea
+apps/frappe/frappe/website/template.py +120,Next,Următor
DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
-DocType: BOM Operation,BOM Operation,Operațiune FDM
+DocType: BOM Operation,BOM Operation,Operațiune BOM
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electropolishing,Electrochimică
DocType: Purchase Taxes and Charges,On Previous Row Amount,La rândul precedent Suma
DocType: Email Digest,New Delivery Notes,Note de livrare noi
@@ -3943,13 +3933,13 @@
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +74,Net pay cannot be negative,Salariul net nu poate fi negativ
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +70,Please enter the Against Vouchers manually,Va rugam sa introduceti pe baza documentelor justificative manual
DocType: SMS Settings,Static Parameters,Parametrii statice
-DocType: Purchase Order,Advance Paid,Avansul plătit
+DocType: Purchase Order,Advance Paid,Avans plătit
DocType: Item,Item Tax,Taxa Articol
DocType: Expense Claim,Employees Email Id,Id Email Angajat
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Raspunderi Curente
apps/erpnext/erpnext/config/crm.py +43,Send mass SMS to your contacts,Trimite SMS-uri în masă a persoanelor de contact
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerare Taxa sau Cost pentru
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +53,Actual Qty is mandatory,Real Cantitate este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +53,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
DocType: Item,"Select ""Yes"" if you are maintaining stock of this item in your Inventory.","Selectați ""Da"", dacă sunteți menținerea stocului de acest element în inventar."
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +415,Item {0} does not exist in {1} {2},Articolul {0} nu există în {1} {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cross-rolling,Cross-laminare
@@ -3961,19 +3951,19 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Va rugam sa introduceti impozite și taxe
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Machining,Prelucrare
DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
-DocType: Hub Settings,Seller Name,Vânzător Nume
+DocType: Hub Settings,Seller Name,Nume vânzător
DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impozite și taxe deduse (Compania de valuta)
DocType: Item Group,General Settings,Setări generale
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Din Valuta și In Valuta nu pot fi identice
DocType: Stock Entry,Repack,Reambalați
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Trebuie să salvați formularul înainte de a începe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +480,Attach Logo,Atașați Logo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +480,Attach Logo,Atașați logo
DocType: Customer,Commission Rate,Rata de Comision
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Cereri de Concediu Blocate de către departament.
-DocType: Production Order,Actual Operating Cost,Actual Cost de operare
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
+DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Root cannot be edited.,Rădăcină nu poate fi editat.
-apps/erpnext/erpnext/accounts/utils.py +188,Allocated amount can not greater than unadusted amount,Suma alocată nu poate mai mare decât valoarea unadusted
-DocType: Manufacturing Settings,Allow Production on Holidays,Permite de producție pe sărbătorilor
+apps/erpnext/erpnext/accounts/utils.py +188,Allocated amount can not greater than unadusted amount,Suma alocată nu poate mai mare decât valoarea neajustată
+DocType: Manufacturing Settings,Allow Production on Holidays,Permiteţi operaţii de producție pe durata sărbătorilor
DocType: Sales Order,Customer's Purchase Order Date,Data Comanda de Aprovizionare Client
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
@@ -3985,7 +3975,7 @@
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +362,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
DocType: Purchase Invoice Item,Discount %,Reducere %
,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
-DocType: Batch,Expiry Date,Data Expirării
+DocType: Batch,Expiry Date,Data expirării
,Supplier Addresses and Contacts,Adrese furnizorului și de Contacte
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vă rugăm să selectați categoria întâi
apps/erpnext/erpnext/config/projects.py +18,Project master.,Maestru proiect.
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 4d3b29c..0ddbd9b 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -120,7 +120,7 @@
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,Родитель Пункт {0} должен быть не со Пункт и должен быть Продажи товара
DocType: Item,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оценить / 60) * Фактическая Время работы
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическая время работы
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,Стоимость доставленных изделий
DocType: Blog Post,Guest,Гость
@@ -403,7 +403,7 @@
DocType: Account,Is Group,Является Группа
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Термоформования
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Продольная резка
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Для дела №"" не может быть меньше, чем ""От дела №"""
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""До Дела №"" не может быть меньше, чем ""От Дела №"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,Некоммерческое предприятие
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не начато
DocType: Lead,Channel Partner,Channel ДУrtner
@@ -553,7 +553,7 @@
DocType: Employee,Reason for Resignation,Причиной отставки
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Шаблон для аттестации.
DocType: Payment Reconciliation,Invoice/Journal Entry Details,Счет / Журнал вступления подробнее
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' не в {2} Фискальном году
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' не в {2} Финансовом году
DocType: Buying Settings,Settings for Buying Module,Настройки для покупки модуля
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Пожалуйста, введите ТОВАРНЫЙ ЧЕК первый"
DocType: Buying Settings,Supplier Naming By,Поставщик Именование По
@@ -565,7 +565,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,От купли получении
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
DocType: SMS Settings,Receiver Parameter,Приемник Параметр
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основе"" и ""Группировка по"" не могут быть одинаковыми"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
DocType: Sales Person,Sales Person Targets,Менеджера по продажам Цели
sites/assets/js/form.min.js +253,To,для
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
@@ -967,13 +967,13 @@
DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
DocType: Contact Us Settings,Address,Адрес
DocType: Expense Claim,From Employee,От работника
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1}, не в любом финансовом году. Для получения более подробной проверки {2}."
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} не состоит ни в одном Финансовом году. Для получения подробностей проверьте {2}.
apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата
DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,Транспортные расходы
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} должны быть отправлены
DocType: SMS Center,Total Characters,Персонажей
apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-образный Счет Подробно
@@ -1960,7 +1960,7 @@
DocType: Employee,Previous Work Experience,Предыдущий опыт работы
DocType: Stock Entry,For Quantity,Для Количество
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} не отправлен
apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Запросы на предметы.
DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
DocType: Email Digest,New Communications,Новые Коммуникации
@@ -2467,7 +2467,7 @@
apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
DocType: Leave Allocation,Carry Forwarded Leaves,Carry направляются листья
-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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
,Stock Projected Qty,Фото со Прогнозируемый Количество
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
DocType: Warranty Claim,From Company,От компании
@@ -2553,7 +2553,7 @@
DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Заказ на {0} не представлено
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} вводится более одного раза в пункт Таблица вариантов
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} дублируется в Таблице вариантов
,Projected,Проектированный
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {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},Примечание: Ссылка Дата превышает разрешенный лимит дней по {0} дней для {1} {2}
@@ -2967,7 +2967,7 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
DocType: Sales Team,Contact No.,Контактный номер
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Прибыль И Убытки"" Аккаунту типа {0} закрыт доступ на Открытие записи"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
DocType: Workflow State,Time,Время
DocType: Features Setup,Sales Discounts,Продажи Купоны
DocType: Hub Settings,Seller Country,Продавец Страна
@@ -3420,7 +3420,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Склад не найден в системе
DocType: Quality Inspection Reading,Quality Inspection 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.,"""Заморозить остатки старше"" должны быть меньше %d дней."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
,Project wise Stock Tracking,Проект мудрый слежения со
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
DocType: Stock Entry Detail,Actual Qty (at source/target),Фактический Кол-во (в источнике / цели)
@@ -3685,7 +3685,7 @@
DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""Адрес Email Для Уведомлений"" не указан для повторяющихся %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,Фрезерный
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,Нарезки
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административные затраты
@@ -3745,7 +3745,7 @@
DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддержание же скоростью протяжении цикла продаж
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},Не можете вернуть более {0} для Пункт {1}
DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планировать время журналы за пределами рабочего времени рабочих станций.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} уже представлен
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} уже отправлен
,Items To Be Requested,"Предметы, будет предложено"
DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
DocType: Company,Company Info,Информация о компании
@@ -3759,7 +3759,7 @@
DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
DocType: Purchase Common,Purchase Common,Покупка Common
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} был изменен. Обновите.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,Из возможностей
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Гашение
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index ed19677..2fb95d8 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -22,7 +22,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Compaction plus sintering,Набијања плус синтерирање
DocType: Sales BOM,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""",Ставка која представља пакет. Ова тачка мора да "Зар берза Ставка" као "не" и "Да ли је продаје тачка" као "Да"
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Хоће ли бити обрачуната у трансакцији.
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Биће обрачунато у овој трансакцији.
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,Унесите Ид радник овог продајног пароха
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},"Пожалуйста, установите ключи доступа Google Drive, в {0}"
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,Од материјала захтеву
@@ -34,7 +34,7 @@
DocType: C-Form,Customer,Купац
DocType: Purchase Receipt Item,Required By,Обавезно Би
DocType: Department,Department,Одељење
-DocType: Purchase Order,% Billed,Изграђена%
+DocType: Purchase Order,% Billed,Фактурисано %
DocType: Selling Settings,Customer Name,Име клијента
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.","Все экспорт смежных областях , как валюты, обменный курс , экспорт Количество , экспорт общего итога и т.д. доступны в накладной , POS, цитаты , счет-фактура , заказ клиента и т.д."
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Хеадс (или групе) против које рачуноводствене уноси се праве и биланси се одржавају.
@@ -199,12 +199,12 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
sites/assets/js/form.min.js +261,Start,старт
DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,Ваш сетуп завршен. Освежавајући.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,Ваш сетап је завршен. Освежававање.
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Full-mold casting,Пуно радно калупима
DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
DocType: Email Digest,Payments made during the digest period,Плаћања извршена током периода дигест
DocType: Production Planning Tool,Sales Orders,Салес Ордерс
-DocType: Purchase Taxes and Charges,Valuation,Вредност
+DocType: Purchase Taxes and Charges,Valuation,Вредновање
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Постави као подразумевано
,Purchase Order Trends,Куповина Трендови Ордер
apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Додела лишће за годину.
@@ -245,7 +245,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +167,Leaves per Year,Леавес по години
DocType: Time Log,Will be updated when batched.,Да ли ће се ажурирати када дозирају.
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.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
-apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
DocType: Brand,Material Master Manager,Материјал Мастер менаџер
DocType: Bulk Email,Message,Порука
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +663,Pending Items {0} updated,Нерешенные вопросы {0} обновляется
@@ -288,7 +288,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Изаберите Тип пуњења први
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,најновији
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,Max 5 characters,Макс 5 знакова
-DocType: Email Digest,New Quotations,Нове Цитати
+DocType: Email Digest,New Quotations,Нове понуде
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +194,Select Your Language,Выбор языка
DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
@@ -348,11 +348,11 @@
apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Групно (много) од стране јединице.
DocType: C-Form Invoice Detail,Invoice Date,Фактуре
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'","Како не постојите залиха трансакција за ову ставку, не можете мењати вредности 'Хас редним бројем', 'Хас Серијски бр', 'Да ли лагеру предмета' и '' Вредновање Метход"
-apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,Ваш электронный адрес
+apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,Ваша имејл адреса
DocType: Email Digest,Income booked for the digest period,Приходи резервисано за период дигест
apps/erpnext/erpnext/config/setup.py +106,Supplier master.,Мастер Поставщик .
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,Молимо погледајте прилог
-DocType: Purchase Order,% Received,% Примљене
+DocType: Purchase Order,% Received,% Примљено
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,Воденим млазом
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,Подешавање Већ Комплетна !
,Finished Goods,готове робе
@@ -396,7 +396,7 @@
DocType: Purchase Order,Start date of current order's period,Старт датум периода постојећи поредак је
apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
-DocType: Delivery Note,% Installed,Инсталирана%
+DocType: Delivery Note,% Installed,Инсталирано %
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,Молимо унесите прво име компаније
DocType: BOM,Item Desription,Ставка Десриптион
DocType: Buying Settings,Supplier Name,Снабдевач Име
@@ -441,7 +441,7 @@
DocType: Journal Entry,Accounts Payable,Обавезе према добављачима
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додај претплатника
sites/assets/js/erpnext.min.js +2,""" does not exists",""" Не постоји"
-DocType: Pricing Rule,Valid Upto,Важи Упто
+DocType: Pricing Rule,Valid Upto,Важи до
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
DocType: Email Digest,Open Tickets,Отворене Улазнице
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
@@ -494,20 +494,20 @@
DocType: Company,Ignore,Игнорисати
DocType: Backup Manager,Enter Verification Code,Унесите верификациони код
apps/erpnext/erpnext/controllers/buying_controller.py +136,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
-DocType: Pricing Rule,Valid From,Действует с
+DocType: Pricing Rule,Valid From,Важи од
DocType: Sales Invoice,Total Commission,Укупно Комисија
DocType: Pricing Rule,Sales Partner,Продаја Партнер
DocType: Buying Settings,Purchase Receipt Required,Куповина Потврда Обавезно
DocType: Monthly Distribution,"**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**","** Месечни Дистрибуција ** помаже вам дистрибуирате свој буџет преко месеци ако имате сезонски у вашем послу.
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Месечна Дистрибуција** помаже распоредите свој буџет по месецима ако је ваш посао сезонског типа.
- Да дистрибуира буџет користећи ову дистрибуцију, поставите ову ** мјесечни ** у ** трошкова Центра **"
+ Да распоредите буџет користећи ову расподелу, поставите **Месечна расподела** у **Трошковни Центар**"
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,No records found in the Invoice table,Нема резултата у фактури табели записи
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
apps/erpnext/erpnext/config/accounts.py +79,Financial / accounting year.,Финансовый / отчетного года .
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +172,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
-DocType: Email Digest,New Supplier Quotations,Новог добављача Цитати
+DocType: Email Digest,New Supplier Quotations,Нове понуде добављача
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,Маке Продаја Наручите
DocType: Project Task,Project Task,Пројектни задатак
,Lead Id,Олово Ид
@@ -565,7 +565,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,Од рачуном
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Исто аукција је ушао више пута.
DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" На основе "" и "" Группировка по "" не может быть таким же,"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основу"" и ""Групиши по"" не могу бити идентични"
DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
sites/assets/js/form.min.js +253,To,на
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
@@ -836,7 +836,7 @@
DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
DocType: Item,Is Purchase Item,Да ли је куповина артикла
DocType: Payment Reconciliation Payment,Purchase Invoice,Фактури
-DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детаљ Нема
+DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детаљ Бр.
DocType: Stock Entry,Total Outgoing Value,Укупна вредност Одлазећи
DocType: Lead,Request for Information,Захтев за информације
DocType: Payment Tool,Paid,Плаћен
@@ -873,7 +873,7 @@
DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
DocType: Workflow State,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.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
-DocType: Purchase Order,% of materials billed against this Purchase Order.,% Материјала наплаћени против ове нарудзбенице.
+DocType: Purchase Order,% of materials billed against this Purchase Order.,% наплаћених материјала на основу ове Поруџбенице.
apps/erpnext/erpnext/controllers/selling_controller.py +155,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 +34,Opening Qty,Отварање Кол
@@ -901,7 +901,7 @@
apps/erpnext/erpnext/templates/form_grid/item_grid.html +67,Discount,Попуст
DocType: Features Setup,Purchase Discounts,Куповина Попусти
DocType: Stock Entry,This will override Difference Account in Item,Ово ће променити разлика рачун у тачки
-DocType: Workstation,Wages,Плата
+DocType: Workstation,Wages,Плате
DocType: Time Log,Will be updated only if Time Log is 'Billable',Да ли ће бити ажурирани само ако се време је 'Наплативо'
DocType: Project,Internal,Интерни
DocType: Task,Urgent,Хитан
@@ -999,7 +999,7 @@
DocType: Salary Slip,Earnings,Зарада
DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Ништа се захтевати
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',""" Фактическое начало Дата "" не может быть больше, чем «Актуальные Дата окончания '"
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,управљање
apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Врсте активности за време Схеетс
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Ливење
@@ -1024,7 +1024,7 @@
apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Порески и други плата одбитака.
DocType: Lead,Lead,Довести
DocType: Email Digest,Payables,Обавезе
-DocType: Account,Warehouse,магацин
+DocType: Account,Warehouse,Магацин
,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
DocType: Purchase Invoice Item,Net Rate,Нето курс
DocType: Backup Manager,Database Folder ID,База података Фолдер ИД
@@ -1039,7 +1039,7 @@
DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,""" Записи "" не может быть пустым"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
,Trial Balance,Пробни биланс
sites/assets/js/erpnext.min.js +2,"Grid ""","Мрежа """
@@ -1089,7 +1089,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,Мали
DocType: Employee,Employee Number,Запослени Број
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
-DocType: Material Request,% Completed,Завршен%
+DocType: Material Request,% Completed,Завршено %
,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Глава счета {0} создан
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Green,Зелен
@@ -1197,7 +1197,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или "" Отклонено """
DocType: Sales Invoice,Sales BOM Help,Продаја БОМ Помоћ
DocType: Purchase Invoice,Contact Person,Контакт особа
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',""" Ожидаемый Дата начала ' не может быть больше , чем"" Ожидаемый Дата окончания '"
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекивани датум почетка"" не може бити већи од ""Очекивани датум завршетка"""
DocType: Holiday List,Holidays,Празници
DocType: Sales Order Item,Planned Quantity,Планирана количина
DocType: Purchase Invoice Item,Item Tax Amount,Ставка Износ пореза
@@ -1345,7 +1345,7 @@
DocType: Production Planning Tool,Select Sales Orders,Избор продајних налога
,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
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.,Да бисте пратили ставки помоћу баркод. Моћи ћете да унесете ставке у испоруци напомени и продаје фактуру за скенирање баркода на ставке.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Маке цитат
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи понуду
DocType: Dependent Task,Dependent Task,Зависна Задатак
apps/erpnext/erpnext/stock/doctype/item/item.py +291,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {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.,Не можете да унесете како доставници Не и продаје Фактура бр Унесите било коју .
@@ -1450,7 +1450,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +41,Party Type and Party is required for Receivable / Payable account {0},Странка Тип и Странка је потребан за примања / обавезе обзир {0}
DocType: Lead,Next Contact By,Следеће Контакт По
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Склад {0} не может быть удален как существует количество для Пункт {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацин {0} не може бити обрисан јер постоји количина за Ставку {1}
DocType: Quotation,Order Type,Врста поруџбине
DocType: Purchase Invoice,Notification Email Address,Обавештење е-маил адреса
DocType: Payment Tool,Find Invoices to Match,Пронађи фактуре да одговара
@@ -1484,7 +1484,7 @@
DocType: Territory,Territory Name,Територија Име
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Подносилац захтева за посао.
-DocType: Sales Invoice Item,Warehouse and Reference,Магацин и Референтни
+DocType: Sales Invoice Item,Warehouse and Reference,Магацини и Референца
DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
DocType: Country,Country,Земља
apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,Адресе
@@ -1673,14 +1673,14 @@
,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,Од време не може бити већи од То Тиме
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,Ваш финансовый год заканчивается
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,Ваша финансијска година се завршава
DocType: POS Setting,Price List,Ценовник
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} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,Расходи Потраживања
DocType: Email Digest,Support,Подршка
DocType: Authorization Rule,Approving Role,Одобравање улоге
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +89,Please specify currency in Company,Молимо наведите валуту у Друштву
-DocType: Workstation,Wages per hour,Плате на сат
+DocType: Workstation,Wages per hour,Сатнице
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},Сток стање у батцх {0} ће постати негативна {1} за {2} тачком у складишту {3}
apps/erpnext/erpnext/config/setup.py +53,"Show / Hide features like Serial Nos, POS etc.","Показать / скрыть функции, такие как последовательный Нос, POS и т.д."
DocType: Purchase Receipt,LR No,ЛР Нема
@@ -1689,11 +1689,11 @@
DocType: Salary Slip,Deduction,Одузимање
DocType: Address Template,Address Template,Адреса шаблона
DocType: Territory,Classification of Customers by region,Класификација купаца по региону
-DocType: Project,% Tasks Completed,% Задаци Завршен
+DocType: Project,% Tasks Completed,% Завршених послова
DocType: Project,Gross Margin,Бруто маржа
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Молимо унесите прво Производња пункт
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,искључени корисник
-DocType: Opportunity,Quotation,Цитат
+DocType: Opportunity,Quotation,Понуда
DocType: Salary Slip,Total Deduction,Укупно Одбитак
apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,Хеј! Само напред и додајте адресу
DocType: Quotation,Maintenance User,Одржавање Корисник
@@ -1702,7 +1702,7 @@
DocType: Employee,Date of Birth,Датум рођења
DocType: Salary Manager,Salary Manager,Плата Менаџер
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,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: 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: Production Order Operation,Actual Operation Time,Стварна Операција време
DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
@@ -1734,7 +1734,7 @@
DocType: Global Defaults,Default Company,Уобичајено Компанија
apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
DocType: Employee,Bank Name,Име банке
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Абове
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Изнад
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,Пользователь {0} отключена
DocType: Leave Application,Total Leave Days,Укупно ЛЕАВЕ Дана
DocType: Email Digest,Note: Email will not be sent to disabled users,Напомена: Е-маил неће бити послат са инвалидитетом корисницима
@@ -1861,7 +1861,7 @@
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Неважећи {0}: {1}
DocType: Sales Invoice Advance,Advance Amount,Унапред Износ
DocType: Manufacturing Settings,Capacity Planning,Капацитет Планирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,""" С даты ' требуется"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Од датума"" је обавезно"
DocType: Journal Entry,Reference Number,Референтни број
DocType: Employee,Employment Details,Детаљи за запошљавање
DocType: Employee,New Workplace,Новом радном месту
@@ -1971,7 +1971,7 @@
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Укупно Абсент
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Јединица мере
-DocType: Fiscal Year,Year End Date,Година Датум завршетка
+DocType: Fiscal Year,Year End Date,Датум завршетка године
DocType: Task Depends On,Task Depends On,Задатак Дубоко У
DocType: Lead,Opportunity,Прилика
DocType: Salary Structure Earning,Salary Structure Earning,Плата Структура Зарада
@@ -2399,7 +2399,7 @@
DocType: Features Setup,To enable <b>Point of Sale</b> features,Да бисте омогућили <b>Поинт оф Сале</b> функција
DocType: Purchase Receipt,LR Date,ЛР Датум
apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изаберите тип трансакције
-DocType: GL Entry,Voucher No,Ваучер Нема
+DocType: GL Entry,Voucher No,Ваучер Бр.
DocType: Leave Allocation,Leave Allocation,Оставите Алокација
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,""" Обновление со 'для Расходная накладная {0} должен быть установлен"
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,Запросы Материал {0} создан
@@ -2462,7 +2462,7 @@
apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
DocType: Leave Allocation,Carry Forwarded Leaves,Царри Форвардед Леавес
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',""" С даты 'должно быть после ' To Date '"
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
,Stock Projected Qty,Пројектовани Стоцк Кти
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
DocType: Warranty Claim,From Company,Из компаније
@@ -2479,7 +2479,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Цитата {0} не типа {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
-DocType: Sales Order,% Delivered,Испоручено%
+DocType: Sales Order,% Delivered,Испоручено %
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт счета
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Маке плата Слип
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,отпушити
@@ -2506,7 +2506,7 @@
DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
DocType: BOM Operation,Hour Rate,Стопа час
DocType: Stock Settings,Item Naming By,Шифра назив под
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,Од понуду
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,Од понуде
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Рачун {0} не постоји
@@ -2580,7 +2580,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,Врелог метала гаса формирање
DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацин {0}: Предузеће је обавезно
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацин {0}: Фирма је обавезна
DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,Проценат варијација у количини да буде дозвољено док прима или пружа ову ставку.
DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,Корпа порези и таксе Мастер
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.",Иди на одговарајуће групе (обично извор средстава> садашње пасиве> порезе и царине и креирати нови налог (кликом на Додај Цхилд) типа "порез" и помињу пореска стопа.
@@ -2619,7 +2619,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
DocType: Sales Invoice,Against Income Account,Против приход
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Деливеред
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Испоручено
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).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
DocType: Territory,Territory Targets,Територија Мете
@@ -2777,7 +2777,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,Все территории
DocType: Party Type,Party Type Name,Партия Тип Название
DocType: Purchase Invoice,Items,Артикли
-DocType: Fiscal Year,Year Name,Година Име
+DocType: Fiscal Year,Year Name,Име године
DocType: Salary Manager,Process Payroll,Процес Паиролл
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
DocType: Sales Partner,Sales Partner Name,Продаја Име партнера
@@ -2789,7 +2789,7 @@
DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Drilling,Бушење
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Blow molding,Дување
-DocType: Purchase Taxes and Charges,Valuation and Total,Процена и Тотал
+DocType: Purchase Taxes and Charges,Valuation and 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,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
DocType: Account,Purchase User,Куповина Корисник
DocType: Sales Order,Customer's Purchase Order Number,Наруџбенице купца Број
@@ -2802,7 +2802,7 @@
DocType: Quotation,Maintenance Manager,Менаџер Одржавање
DocType: Workflow State,Search,Претрага
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всего не может быть нулевым
-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,""" Дни с последнего Порядке так должно быть больше или равно нулю"
+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,"""Дана од последње поруџбине"" мора бити веће или једнако нули"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,Лемљење
DocType: C-Form,Amended From,Измењена од
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,сырье
@@ -2840,7 +2840,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,Пребаци Материјал добављачу
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,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
DocType: Lead,Lead Type,Олово Тип
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,Направи цитат
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,Направи понуду
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,Все эти предметы уже выставлен счет
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
@@ -2864,7 +2864,7 @@
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: Pricing Rule,Customer Group,Кориснички Група
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
-DocType: Item,Website Description,Сајт Опис
+DocType: Item,Website Description,Вебсајт Опис
DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
,Sales Register,Продаја Регистрација
DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
@@ -2993,7 +2993,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,судебные издержки
DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Дан у месецу на којем би аутоматски ће се генерисати нпр 05, 28 итд"
DocType: Sales Invoice,Posting Time,Постављање Време
-DocType: Sales Order,% Amount Billed,Износ% Фактурисана
+DocType: Sales Order,% Amount Billed,% Фактурисаних износа
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Телефон Расходы
DocType: Sales Partner,Logo,Лого
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,"{0} Серийные номера , необходимые для Пункт {0} . Только {0} предусмотрено."
@@ -3149,7 +3149,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,Rate (%),Ставка (%)
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year End Date,Финансовый год Дата окончания
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +502,Make Supplier Quotation,Маке добављача цитат
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +502,Make Supplier Quotation,Направи понуду добављача
DocType: Quality Inspection,Incoming,Долазни
DocType: Item,Name and Description,Име и опис
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.","Уобичајено Јединица мере не могу се директно мењати јер сте већ направили неку трансакцију (е) са другим УЦГ . Да бисте променили подразумевани УЦГ , користите ' УОМ Замени Утилити "" алатку под Стоцк модула ."
@@ -3177,7 +3177,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
DocType: Accounts Settings,Accounts Settings,Рачуни Подешавања
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Сооружения и оборудование
-DocType: Item,You can enter the minimum quantity of this item to be ordered.,Можете да унесете минималну количину ове ставке се могу наручити.
+DocType: Item,You can enter the minimum quantity of this item to be ordered.,Можете да унесете минималну количину ове ставке за наручивање.
DocType: Sales Partner,Partner's Website,Партнер аутора
DocType: Opportunity,To Discuss,Да Дисцусс
DocType: SMS Settings,SMS Settings,СМС подешавања
@@ -3200,7 +3200,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Вретена обрада
-DocType: Material Request,% of materials ordered against this Material Request,% Материјала изрећи овај материјал захтеву
+DocType: Material Request,% of materials ordered against this Material Request,% примљених материјала на основу овог Требовања
DocType: BOM,Last Purchase Rate,Последња куповина Стопа
DocType: Account,Asset,преимућство
DocType: Project Task,Task ID,Задатак ИД
@@ -3208,11 +3208,11 @@
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +75,Stock cannot exist for Item {0} since has variants,Стоцк не може постојати за ставку {0} од има варијанте
,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
DocType: System Settings,Time Zone,Временска зона
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Склад {0} не существует
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Магацин {0} не постоји
apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистер За ЕРПНект Хуб
DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Изабрана опција не може имати Батцх
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Материјала испоручених против ове испоруке Обавештење
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stapling,Стаплинг
DocType: Customer,Customer Details,Кориснички Детаљи
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Shaping,Обликовање
@@ -3235,9 +3235,9 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Статус {0} {1} теперь {2}
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,Стање Кол
DocType: Item Group,Parent Item Group,Родитељ тачка Група
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} {1} за
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} за {1}
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,Цост центри
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Склады .
+apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Складишта.
DocType: Purchase Order,Rate at which supplier's currency is converted to company's base currency,Стопа по којој је добављач валута претвара у основну валуту компаније
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ров # {0}: ТИМИНГС сукоби са редом {1}
DocType: Employee,Employment Type,Тип запослења
@@ -3311,7 +3311,7 @@
DocType: Sales Order Item,For Production,За производњу
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +107,Please enter sales order in the above table,Унесите продаје ред у табели
DocType: Project Task,View Task,Погледај Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,Ваш финансовый год начинается
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,Ваша финансијска година почиње
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Молимо Вас да унесете куповини Приливи
DocType: Sales Invoice,Get Advances Received,Гет аванси
DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
@@ -3412,7 +3412,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Складиште није пронађен у систему
DocType: Quality Inspection Reading,Quality Inspection Reading,Провера квалитета Рединг
DocType: Party Account,col_break1,цол_бреак1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` Мораторий Акции старше ` должен быть меньше % D дней.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
,Project wise Stock Tracking,Пројекат мудар Праћење залиха
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
DocType: Stock Entry Detail,Actual Qty (at source/target),Стварни Кол (на извору / циљне)
@@ -3529,7 +3529,7 @@
DocType: Delivery Note,To Warehouse,Да Варехоусе
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"' Имеет Серийный номер ' не может быть ""Да"" для не- фондовой пункта"
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
@@ -3618,7 +3618,7 @@
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
apps/frappe/frappe/model/naming.py +40,{0} is required,{0} требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Вакуум ливење
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Вакуумско калупљење
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
DocType: Contact Us Settings,City,Град
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,Ултразвучна машинска обрада
@@ -3631,7 +3631,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
DocType: Sales Partner,Partner Type,Партнер Тип
DocType: Purchase Taxes and Charges,Actual,Стваран
-DocType: Purchase Order,% of materials received against this Purchase Order,% Материјала добио против ове нарудзбенице
+DocType: Purchase Order,% of materials received against this Purchase Order,% примљених материјала на основу ове Наруџбенице
DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
DocType: Production Order,Production Order,Продуцтион Ордер
@@ -3688,7 +3688,7 @@
DocType: Appraisal Goal,Score Earned,Оцена Еарнед
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +391,"e.g. ""My Company LLC""","например "" Моя компания ООО """
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Notice Period,Отказни рок
-DocType: Bank Reconciliation Detail,Voucher ID,Ваучер ИД
+DocType: Bank Reconciliation Detail,Voucher ID,Шифра ваучера
apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,То јекорен територија и не могу да се мењају .
DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
DocType: Email Digest,Receivables / Payables,Потраживања / Обавезе
@@ -3744,7 +3744,7 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
DocType: Production Planning Tool,Filter based on item,Филтер на бази ставке
-DocType: Fiscal Year,Year Start Date,Године Датум почетка
+DocType: Fiscal Year,Year Start Date,Датум почетка године
DocType: Attendance,Employee Name,Запослени Име
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit To account must be a liability account,Дебитна Да налогу мора да буде рачун одговорност
DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
@@ -3766,11 +3766,11 @@
apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} је додао претплатници
DocType: Maintenance Schedule,Schedule,Распоред
DocType: Account,Parent Account,Родитељ рачуна
-DocType: Serial No,Available,доступан
+DocType: Serial No,Available,Доступно
DocType: Quality Inspection Reading,Reading 3,Читање 3
,Hub,Средиште
-DocType: GL Entry,Voucher Type,Ваучер Тип
-DocType: Expense Claim,Approved,Одобрен
+DocType: GL Entry,Voucher Type,Тип ваучера
+DocType: Expense Claim,Approved,Одобрено
DocType: Pricing Rule,Price,цена
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Избор "Да" ће дати јединствени идентитет сваком ентитету ове тачке које се могу видети у серијским Но мајстора.
@@ -3793,7 +3793,7 @@
apps/erpnext/erpnext/templates/includes/cart.js +284,Price List not configured.,Ценовник није подесио.
DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Повуците продајне налоге (чека да испоручи) на основу наведених критеријума
DocType: DocShare,Document Type,Доцумент Типе
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +558,From Supplier Quotation,Од добављача понуду
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +558,From Supplier Quotation,Од понуде добављача
DocType: Deduction Type,Deduction Type,Одбитак Тип
DocType: Attendance,Half Day,Пола дана
DocType: Serial No,Not Available,Није доступно
@@ -3805,7 +3805,7 @@
DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
DocType: Notification Control,Purchase Receipt Message,Куповина примање порука
DocType: Production Order,Actual Start Date,Сунце Датум почетка
-DocType: Sales Order,% of materials delivered against this Sales Order,% Материјала испоручених против овог налога за продају
+DocType: Sales Order,% of materials delivered against this Sales Order,% испоручених материјала на основу овог Налога за продају
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Снимање покрета ставку.
DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен Листа претплатника
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Дубљење
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 735b31c..7ba8935 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -565,7 +565,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,จากการรับซื้อ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ไม่ สามารถเดียวกัน
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ต้องไม่เหมือนกัน
DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
sites/assets/js/form.min.js +253,To,ไปยัง
apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,กรุณากรอกอีเมล์
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 4f3ecdf..9eb356d 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -1918,7 +1918,7 @@
DocType: Purchase Order Item,Supplier Quotation Item,Tedarikçi Teklif ürünü
apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maaş Yapısı oluşturun
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Shearing,Makaslama
-DocType: Item,Has Variants,Değişkenleri Has
+DocType: Item,Has Variants,Varyasyoları var
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.,Yeni Satış Faturası oluşturmak için 'Satış Fatura Yap' butonuna tıklayın.
apps/erpnext/erpnext/controllers/recurring_document.py +164,Period From and Period To dates mandatory for recurring %s,Kimden ve Dönemi% s yinelenen zorunlu tarihleri için Dönemi
DocType: Journal Entry Account,Against Expense Claim,Gider İstem Karşı
@@ -4204,7 +4204,7 @@
DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
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.,'Şundan eski stokları dondur' %günden daha küçük olmalıdır
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Şundan eski stokları dondur' %d günden daha küçük olmalıdır
,Project wise Stock Tracking,Proje bilgisi Stok Takibi
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Bakım Programı {0} {0} karşılığında mevcuttur
DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
@@ -4656,7 +4656,7 @@
DocType: Serial No,Available,Uygun
DocType: Quality Inspection Reading,Reading 3,Reading 3
DocType: Quality Inspection Reading,Reading 3,Reading 3
-,Hub,Merkez
+,Hub,Hub
DocType: GL Entry,Voucher Type,Föy Türü
DocType: Expense Claim,Approved,Onaylandı
DocType: Pricing Rule,Price,Fiyat
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 3aefdb8..d106a26 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -9,7 +9,7 @@
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +72,Please select Party Type first,請選擇黨第一型
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,退火
DocType: Item,Customer Items,客戶項目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} can not be a ledger,帳戶{0}：父帳戶{1}不能是總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +41,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/config/setup.py +63,Email Notifications,電子郵件通知
DocType: Item,Default Unit of Measure,缺省的計量單位
@@ -24,7 +24,7 @@
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},貨幣所需的價格表{0}
DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,請輸入本銷售人員的員工ID
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},請設置Google Drive的存取碼{0}
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},請設定 Google Drive的存取碼{0}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,從物料需求
apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0}樹
DocType: Job Applicant,Job Applicant,求職者
@@ -34,7 +34,7 @@
DocType: C-Form,Customer,客戶
DocType: Purchase Receipt Item,Required By,需求來自
DocType: Department,Department,部門
-DocType: Purchase Order,% Billed,％帳單
+DocType: Purchase Order,% Billed,％已開立帳單
DocType: Selling Settings,Customer Name,客戶名稱
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.",在送貨單， POS機，報價單，銷售發票，銷售訂單等可像貨幣，轉換率，進出口總額，出口總計等所有出口相關領域
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
@@ -53,8 +53,8 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +235,Do really want to unstop production order:,難道真的要unstop生產訂單：
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,新假期申請
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,銀行匯票
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。為了保持客戶明智的項目代碼，並使其搜索根據自己的代碼中使用這個選項
-DocType: Mode of Payment Account,Mode of Payment Account,支付賬戶模式
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。為了保持客戶明智的項目代碼，並使其可供搜索，根據自己的代碼中使用這個選項
+DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
apps/erpnext/erpnext/stock/doctype/item/item.js +60,Show Variants,顯示變體
DocType: Sales Invoice Item,Quantity,數量
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（負債）
@@ -77,7 +77,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,木工
DocType: Production Order Operation,Work In Progress,工作進行中
DocType: Company,If Monthly Budget Exceeded,如果每月超出預算
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,3D打印
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,3D列印
DocType: Employee,Holiday List,假日列表
DocType: Time Log,Time Log,時間日誌
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,會計人員
@@ -106,13 +106,13 @@
DocType: Quality Inspection Reading,Reading 1,閱讀1
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +93,Make Bank Entry,使銀行進入
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Pension Funds,養老基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +116,Warehouse is mandatory if account type is Warehouse,倉庫是強制性的，如果賬戶類型是倉庫
+apps/erpnext/erpnext/accounts/doctype/account/account.py +116,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫，其倉庫項目是強制要設定的，
DocType: SMS Center,All Sales Person,所有的銷售人員
DocType: Backup Manager,Credentials,證書
DocType: Purchase Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",檢查經常性秩序，取消，停止經常性或將適當的結束日期
DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
DocType: Account,Credit,信用
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,請在「人力資源＞人力資源設置」設定員工命名系統
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,請在「人力資源＞人力資源設定」設定員工命名系統
DocType: POS Setting,Write Off Cost Center,沖銷成本中心
DocType: Warehouse,Warehouse Detail,倉庫的詳細信息
apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
@@ -193,7 +193,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +90,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
DocType: Customer,Individual,個人
apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,規劃維護訪問。
-DocType: SMS Settings,Enter url parameter for message,輸入url參數的消息
+DocType: SMS Settings,Enter url parameter for message,輸入url參數的訊息
apps/erpnext/erpnext/config/selling.py +143,Rules for applying pricing and discount.,規則適用的定價和折扣。
apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交付日期
@@ -231,7 +231,7 @@
DocType: Journal Entry,Write Off Amount <=,核銷金額<=
DocType: Lead,Address & Contact,地址及聯繫方式
apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
-DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,創建庫存總帳條目當您提交銷售發票
+DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,當您提交銷貨發票時新增庫存總帳分錄
DocType: Newsletter List,Total Subscribers,用戶總數
DocType: Lead,Contact Name,聯繫人姓名
DocType: Production Plan Item,SO Pending Qty,SO待定數量
@@ -313,7 +313,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Necking,縮頸
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在創建自動材料需求時已電子郵件通知
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +29,Item is updated,項目更新
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +26,Global POS Setting {0} already created for company {1},全球POS設置{0}已為公司{1}創造了
+apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +26,Global POS Setting {0} already created for company {1},已為公司{1}新增全域POS設定{0}
DocType: Comment,System Manager,系統管理器
DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
DocType: Sales Invoice Item,Delivery Note,送貨單
@@ -326,7 +326,7 @@
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,請選擇年份和月份
DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",輸入電子郵件ID用逗號隔開，發票會自動在特定的日期郵寄
DocType: Employee,Company Email,企業郵箱
-DocType: Workflow State,Refresh,刷新
+DocType: Workflow State,Refresh,重新載入
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.",在外購入庫單，供應商報價單，採購發票，採購訂單等所有可像貨幣，轉換率，總進口，進口總計進口等相關領域
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,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +59,Total Order Considered,總訂貨考慮
@@ -352,7 +352,7 @@
DocType: Email Digest,Income booked for the digest period,收入入賬的消化期
apps/erpnext/erpnext/config/setup.py +106,Supplier master.,供應商主。
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,請參閱附件
-DocType: Purchase Order,% Received,收到％
+DocType: Purchase Order,% Received,％ 已收料
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,水射流切割
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,安裝已經完成！
,Finished Goods,成品
@@ -396,22 +396,22 @@
DocType: Purchase Order,Start date of current order's period,啟動電流訂單的期限日期
apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},於{0}列的數量不能是分數
DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
-DocType: Delivery Note,% Installed,％安裝
+DocType: Delivery Note,% Installed,％已安裝
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,請先輸入公司名稱
DocType: BOM,Item Desription,項目Desription
DocType: Buying Settings,Supplier Name,供應商名稱
DocType: Account,Is Group,是集團
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,熱成型
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,縱剪
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“要案件編號”不能少於'從案號“
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,非營利
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未啟動
DocType: Lead,Channel Partner,渠道合作夥伴
DocType: Account,Old Parent,老家長
DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售經理大師
-apps/erpnext/erpnext/config/manufacturing.py +66,Global settings for all manufacturing processes.,所有製造過程中的全局設置。
-DocType: Accounts Settings,Accounts Frozen Upto,賬戶被凍結到
+DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經理
+apps/erpnext/erpnext/config/manufacturing.py +66,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
+DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
DocType: SMS Log,Sent On,發送於
DocType: Sales Order,Not Applicable,不適用
apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假日高手。
@@ -420,7 +420,7 @@
DocType: Delivery Note,Billing Address,帳單地址
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,請輸入產品編號。
DocType: BOM,Costing,成本核算
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，納稅額將被視為已包括在打印速度/打印量
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
DocType: Employee,Health Concerns,健康問題
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Unpaid,未付
@@ -482,7 +482,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,項目{0}不購買產品
apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
Email Address'","{0}在“通知\
-電子郵件地址”無效的電子郵件地址"
+電子郵件地址”中是無效的電子郵件地址"
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,總計費今年：
DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加／編輯稅金及費用
DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
@@ -521,7 +521,7 @@
DocType: Backup Manager,Sync with Google Drive,同步與谷歌驅動器
DocType: Leave Control Panel,Allocate,分配
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,上一筆
-DocType: Stock Entry,Sales Return,銷售退貨
+DocType: Stock Entry,Sales Return,銷貨退回
DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,要從創建生產訂單選擇銷售訂單。
apps/erpnext/erpnext/config/hr.py +120,Salary components.,工資組成部分。
apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
@@ -544,11 +544,11 @@
DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
DocType: Packing Slip Item,DN Detail,DN詳細
DocType: Time Log,Billed,計費
-DocType: Batch,Batch Description,一批說明
+DocType: Batch,Batch Description,批次說明
DocType: Delivery Note,Time at which items were delivered from warehouse,時間在哪個項目是從倉庫運送
DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
DocType: Employee,Organization Profile,組織簡介
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,通過設置>編號系列請設置編號系列考勤
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,透過設定>編號系列，請設定考勤的編號系列
DocType: Email Digest,New Enquiries,新的查詢
DocType: Employee,Reason for Resignation,辭退原因
apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,模板的績效考核。
@@ -572,7 +572,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,End tube forming,尾管成型
DocType: Production Order Operation,In minutes,在幾分鐘內
DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},請設置付款方式{0}默認的現金或銀行賬戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
DocType: Selling Settings,Customer Naming By,客戶命名由
apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,轉換為集團
DocType: Activity Cost,Activity Type,活動類型
@@ -587,7 +587,7 @@
DocType: Material Request,Material Transfer,材料轉讓
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),開啟（Dr）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Posting timestamp must be after {0},發布時間戳記必須晚於{0}
-apps/frappe/frappe/config/setup.py +59,Settings,設置
+apps/frappe/frappe/config/setup.py +59,Settings,設定
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
DocType: Production Order Operation,Actual Start Time,實際開始時間
DocType: BOM Operation,Operation Time,操作時間
@@ -603,7 +603,7 @@
DocType: Sales Order Item,Basic Rate (Company Currency),基礎匯率（公司貨幣）
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,請輸入項目細節
DocType: Purchase Receipt,Other Details,其他詳細信息
-DocType: Account,Accounts,賬戶
+DocType: Account,Accounts,帳戶
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,市場營銷
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Straight shearing,直剪
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.,在基於其序列號的銷售和採購文件跟踪的項目。這也可以用來跟踪商品的保修細節。
@@ -636,7 +636,7 @@
DocType: Purchase Order,Supply Raw Materials,供應原料
DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,在這接下來的發票將生成的日期。它在提交生成。
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 +108,{0} is not a stock Item,{0}不是一個缺貨登記
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0}不是庫存項目
DocType: Mode of Payment Account,Default Account,默認帳戶
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,如果機會是由鉛製成鉛必須設置
DocType: Contact Us Settings,Address Title,地址名稱
@@ -699,13 +699,13 @@
- 這可以是在淨** **總（即基本量的總和）。
- **以前的行總計/金額**（對於累計稅費）。如果選擇此選項，稅收將與前行的百分比（在稅率表）量或總被應用。
- ** **實際（如前所述）。
- 2。賬戶負責人：該帳戶下的台賬此稅收將被黃牌警告
+ 2。帳戶負責人：該帳戶下的台帳此稅收將被黃牌警告
3。成本中心：如果稅/收費收入（如海運）或費用，它需要對一個成本中心預訂。
4。說明：稅收的說明（將在發票/報價印刷）。
5。速度：稅率。
6。金額：稅額。
7。總計：累積總數達到了這一點。
- 8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基地（默認值是前行）的行號。
+ 8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
9。這是含稅的基本速率？：如果你檢查這一點，就意味著這個稅不會顯示在項目表中，但在你的主項表將被納入基本速率。你想要給一個單位的價格（包括所有稅費）的價格為顧客這是非常有用的。"
DocType: Serial No,Purchase Returned,進貨退出
DocType: Employee,Bank A/C No.,銀行A/C No.
@@ -722,12 +722,12 @@
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +64,Please enter Item first,請先輸入品項
DocType: Account,Liability,責任
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
-DocType: Company,Default Cost of Goods Sold Account,銷貨賬戶的默認成本
+DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
apps/erpnext/erpnext/stock/get_item_details.py +238,Price List not selected,未選擇價格列表
DocType: Employee,Family Background,家庭背景
DocType: Salary Manager,Send Email,發送電子郵件
apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,無權限
-DocType: Company,Default Bank Account,默認銀行賬戶
+DocType: Company,Default Bank Account,預設銀行帳戶
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,NOS
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
@@ -746,7 +746,7 @@
apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,客戶支持查詢。
DocType: Bin,Moving Average Rate,移動平均房價
DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0}反對比爾{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0}對於帳單{1}日期{2}
DocType: Communication,Reference Name,參考名稱
DocType: Maintenance Visit,Completion 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",在以下文件送貨單，機遇，材質要求，項目，採購訂單，購買憑證，買方收據，報價單，銷售發票，銷售物料，銷售訂單，序列號跟踪品牌
@@ -783,7 +783,7 @@
DocType: Account,Balance must be,餘額必須
DocType: Hub Settings,Publish Pricing,發布定價
DocType: Email Digest,New Purchase Receipts,新的購買收據
-DocType: Notification Control,Expense Claim Rejected Message,報銷拒絕消息
+DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Nailing,釘
,Available Qty,可用數量
DocType: Purchase Taxes and Charges,On Previous Row Total,在上一行共
@@ -811,7 +811,7 @@
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +68,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
DocType: Salary Slip,Leave Encashment Amount,假期兌現金額
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Setting,使新的POS設置
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Setting,使新的POS設定
DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
DocType: Bank Reconciliation,Total Amount,總金額
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Internet Publishing,互聯網出版
@@ -820,7 +820,7 @@
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
DocType: Purchase Receipt,Range,範圍
-DocType: Supplier,Default Payable Accounts,默認的應付帳款
+DocType: Supplier,Default Payable Accounts,預設應付帳款
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
DocType: Features Setup,Item Barcode,商品條碼
apps/erpnext/erpnext/stock/doctype/item/item.py +193,Item Variants {0} updated,項目變種{0}更新
@@ -829,7 +829,7 @@
DocType: Address,Shop,店
DocType: Hub Settings,Sync Now,立即同步
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,默認銀行/現金帳戶將被自動在POS機發票時選擇此模式更新。
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票，且選擇此模式時自動更新。
DocType: Employee,Permanent Address Is,永久地址
DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,品牌
@@ -852,14 +852,14 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +390,Company Name,公司名稱
DocType: SMS Center,Total Message(s),總信息（s ）
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +508,Select Item for Transfer,對於轉讓項目選擇
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行賬戶的頭。
+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/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,化學藥品
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
DocType: Salary Manager,Select Payroll Year and Month,選擇薪資年和月
-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""",轉到相應的組（通常資金運用>流動資產>銀行帳戶，並創建一個新帳戶（通過點擊添加類型的兒童），“銀行”
+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""",轉到相應的群組（通常資金運用>流動資產>銀行帳戶，並新增一個新帳戶（通過點擊添加類型的兒童），“銀行”
DocType: Workstation,Electricity Cost,電力成本
DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
DocType: Comment,Unsubscribed,退訂
@@ -874,7 +874,7 @@
DocType: Journal Entry,Total Amount in Words,總金額詞
DocType: Workflow State,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.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
-DocType: Purchase Order,% of materials billed against this Purchase Order.,％的材料嘴對這種採購訂單。
+DocType: Purchase Order,% of materials billed against this Purchase Order.,針對這張採購訂單的已出帳物料的百分比(%)
apps/erpnext/erpnext/controllers/selling_controller.py +155,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 +34,Opening Qty,開放數量
@@ -885,18 +885,18 @@
DocType: Leave Application,Leave Application,休假申請
apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,排假工具
DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
-DocType: Email Digest,Buying & Selling,購買與銷售
+DocType: Email Digest,Buying & Selling,採購與銷售
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Trimming,修剪
DocType: Workstation,Net Hour Rate,淨小時率
DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本外購入庫單
DocType: Packing Slip Item,Packing Slip Item,裝箱單項目
-DocType: POS Setting,Cash/Bank Account,現金／銀行賬戶
+DocType: POS Setting,Cash/Bank Account,現金／銀行帳戶
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
DocType: Delivery Note,Delivery To,交貨給
DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,"Row {0}: Party / Account does not match with \
- Customer / Debit To in {1}","行{0}：黨/賬戶不與\
+ Customer / Debit To in {1}","行{0}：黨/帳戶不與\
客戶/借記要在匹配{1}"
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Filing,備案
apps/erpnext/erpnext/templates/form_grid/item_grid.html +67,Discount,折扣
@@ -924,7 +924,7 @@
DocType: Item,Manufacturer,生產廠家
DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
DocType: Sales Order,PO Date,訂單日期
-DocType: Serial No,Sales Returned,銷售退回
+DocType: Serial No,Sales Returned,銷貨退回
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,銷售金額
apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,時間日誌
@@ -936,7 +936,7 @@
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
DocType: BOM Operation,Operation,手術
DocType: Lead,Organization Name,組織名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,POS Setting required to make POS Entry,使POS機輸入所需設置POS機
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,POS Setting required to make POS Entry,製作POS分錄需要先設定POS設定
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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,標準採購
@@ -1040,7 +1040,7 @@
DocType: Global Defaults,Current Fiscal Year,當前會計年度
DocType: Global Defaults,Disable Rounded Total,禁用圓角總
DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,“參賽作品”不能為空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,“分錄”不能是空的
apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},重複的行{0}同{1}
,Trial Balance,試算表
sites/assets/js/erpnext.min.js +2,"Grid """,電網“
@@ -1113,7 +1113,7 @@
DocType: Address,City/Town,市/鎮
DocType: Serial No,Serial No Details,序列號信息
DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有信用賬戶可以對另一個借記鏈接
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,送貨單{0}未提交
apps/erpnext/erpnext/stock/get_item_details.py +137,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
@@ -1204,12 +1204,12 @@
DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
DocType: Supplier Quotation,Get Terms and Conditions,獲取條款和條件
DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的電荷不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +165,Max: {0},馬克斯：{0}
apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,從日期時間
DocType: Email Digest,For Company,對於公司
apps/erpnext/erpnext/config/support.py +38,Communication log.,通信日誌。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,客戶買入金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,購買金額
DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
DocType: Material Request,Terms and Conditions Content,條款及細則內容
@@ -1237,7 +1237,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +147,Employee cannot report to himself.,員工不能報告自己。
DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況，學歷等。
-DocType: Journal Entry Account,Account Balance,賬戶餘額
+DocType: Journal Entry Account,Account Balance,帳戶餘額
DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +578,We buy this Item,我們買這個項目
DocType: Address,Billing,計費
@@ -1245,7 +1245,7 @@
DocType: Bulk Email,Not Sent,未發送
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Explosive forming,爆炸成形
DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
-DocType: Shipping Rule,Shipping Account,送貨賬戶
+DocType: Shipping Rule,Shipping Account,送貨帳戶
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +41,Scheduled to send to {0} recipients,原定發送到{0}受助人
DocType: Quality Inspection,Readings,閱讀
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Sub Assemblies,子組件
@@ -1302,15 +1302,15 @@
DocType: Workflow State,Tasks,任務
DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
DocType: Event,Tuesday,星期二
-DocType: Leave Block List,Block Holidays on important days.,塊假期重要的日子。
+DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
,Accounts Receivable Summary,應收賬款匯總
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設置員工角色設置用戶ID字段
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
DocType: UOM,UOM Name,計量單位名稱
DocType: Top Bar Item,Target,目標
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,貢獻金額
DocType: Sales 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.,在字將是可見的，一旦你保存送貨單。
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存，就會顯示出來。
apps/erpnext/erpnext/config/stock.py +120,Brand master.,品牌大師。
DocType: ToDo,Due Date,到期日
DocType: Sales Invoice Item,Brand Name,商標名稱
@@ -1323,11 +1323,11 @@
DocType: Pricing Rule,Pricing Rule,定價規則
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Notching,開槽
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +44,Reserved warehouse required for stock item {0},所需的庫存項目保留倉庫{0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行賬戶
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
,Bank Reconciliation Statement,銀行對帳表
DocType: Address,Lead Name,鉛名稱
,POS,POS
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0}必須只出現一次
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0}必須只能出現一次
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},{0}的排假成功
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
@@ -1375,11 +1375,11 @@
DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,任務是強制性的，如果費用報銷是對一個項目
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,外購入庫單{0}未提交
-DocType: Company,Default Payable Account,默認情況下應付賬款
+DocType: Company,Default Payable Account,預設應付賬款
DocType: Party Type,Contacts,往來
apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車，如航運規則，價格表等
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,安裝完成
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}％帳單
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}％已開立帳單
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,保留數量
DocType: Party Account,Party Account,黨的帳戶
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,人力資源
@@ -1414,7 +1414,7 @@
DocType: Maintenance Visit,Partially Completed,部分完成
DocType: Sales Invoice,Packed Items,盒裝項目
apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,針對序列號保修索賠
-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",在它使用的所有其他材料明細表替換特定的BOM。它將取代舊的BOM鏈接，更新成本和再生“BOM爆炸物品”表按照新的BOM
+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",在它使用的所有其他材料明細表替換特定的BOM。它將取代舊的BOM鏈接，更新成本和再生“BOM展開項目”表按照新的BOM
DocType: Shopping Cart Settings,Enable Shopping Cart,讓購物車
DocType: Employee,Permanent Address,永久地址
apps/erpnext/erpnext/stock/get_item_details.py +123,Item {0} must be a Service Item.,項{0}必須是一個服務項目。
@@ -1463,7 +1463,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +178,No Production Orders created,沒有創建生產訂單
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,員工{0}於本月的工資單已經創建
DocType: Stock Reconciliation,Reconciliation JSON,JSON對賬
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。導出報表，並使用電子表格應用程序進行打印。
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
DocType: Sales Invoice Item,Batch No,批號
apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,主頁
DocType: DocPerm,Delete,刪除
@@ -1476,7 +1476,7 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +31,Opportunity From field is mandatory,機會從字段是強制性的
DocType: Sales Invoice,Considered as an Opening Balance,視為期初餘額
DocType: Item,Variants,變種
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,做採購訂單
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,製作採購訂單
DocType: SMS Center,Send To,發送到
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
DocType: Sales Team,Contribution to Net Total,貢獻合計淨
@@ -1493,7 +1493,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
DocType: Shipping Rule Condition,A condition for a Shipping Rule,為航運規則的條件
-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",新帳戶的名稱。注：請不要創建帳戶客戶和供應商，它們會自動從客戶和供應商創造大師
+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",新帳戶的名稱。注意：請不要新增客戶和供應商的帳戶，它們會自動從客戶和供應商主檔新增。
DocType: DocField,Attach Image,附上圖片
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
DocType: Stock Reconciliation Item,Leave blank if no change,離開，如果沒有變化的空白
@@ -1508,8 +1508,8 @@
DocType: Offer Letter,Rejected,拒絕
DocType: Pricing Rule,Brand,牌
DocType: Item,Will also apply for variants,同時將申請變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,％交付
-apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,捆綁項目在銷售時。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,％已交付
+apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,在銷售時捆綁項目。
DocType: Sales Order Item,Actual Qty,實際數量
DocType: Quality Inspection Reading,Reading 10,閱讀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.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
@@ -1534,7 +1534,7 @@
DocType: Leave Application,Apply / Approve Leaves,申請/審批葉
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',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
DocType: Item,Allowance Percent,津貼百分比
-DocType: SMS Settings,Message Parameter,消息參數
+DocType: SMS Settings,Message Parameter,訊息參數
DocType: Serial No,Delivery Document No,交貨證明文件號碼
DocType: Landed Cost Voucher,Get Items From Purchase Receipts,獲取項目從購買收據
DocType: Serial No,Creation Date,創建日期
@@ -1575,7 +1575,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,竊聽
DocType: Naming Series,Current Value,當前值
apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},項目模板不能有股市和varaiants。請從倉庫取出的股票{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0}創建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0}新增
DocType: Journal Entry Account,Against Sales Order,對銷售訂單
,Serial No Status,序列號狀態
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,項目表不能為空
@@ -1661,7 +1661,7 @@
DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
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,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
DocType: HR Settings,HR Settings,人力資源設置
-apps/frappe/frappe/config/setup.py +130,Printing,印花
+apps/frappe/frappe/config/setup.py +130,Printing,列印
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
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.,在天在你申請許可的假期。你不需要申請許可。
sites/assets/js/desk.min.js +684,and,和
@@ -1671,14 +1671,14 @@
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.",獲取估值率和可用庫存在上提到過賬日期 - 時間源/目標倉庫。如果序列化的項目，請輸入序列號後，按下此按鈕。
apps/erpnext/erpnext/templates/includes/cart.js +288,Something went wrong.,出事了。
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Unit,單位
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +129,Please set Dropbox access keys in your site config,請在您的網站配置設置Dropbox的存取碼
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +129,Please set Dropbox access keys in your site config,請在您的網站配置設定Dropbox的存取碼
apps/erpnext/erpnext/stock/get_item_details.py +114,Please specify Company,請註明公司
,Customer Acquisition and Loyalty,客戶獲得和忠誠度
apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,從時間不能大於時間
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,倉庫你在哪裡維護拒絕的項目庫存
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,您的財政年度結束於
DocType: POS Setting,Price List,價格表
-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}現在是默認的財政年度。請刷新您的瀏覽器，以使更改生效。
+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}現在是預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,報銷
DocType: Email Digest,Support,支持
DocType: Authorization Rule,Approving Role,審批角色
@@ -1692,7 +1692,7 @@
DocType: Salary Slip,Deduction,扣除
DocType: Address Template,Address Template,地址模板
DocType: Territory,Classification of Customers by region,客戶按區域分類
-DocType: Project,% Tasks Completed,％完成的任務
+DocType: Project,% Tasks Completed,％ 工作已完成
DocType: Project,Gross Margin,毛利
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,請先輸入生產項目
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,禁用的用戶
@@ -1736,7 +1736,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雜項開支
DocType: Global Defaults,Default Company,默認公司
apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,費用或差異帳戶是強制性的項目{0} ，因為它影響整個股票價值
-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",不能行overbill的項目{0} {1}超過{2}。要允許超額計費，請在股票設置設置
+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",無法行overbill的項目{0} {1}超過{2}。要允許超額計費，請在「股票設定」設定
DocType: Employee,Bank Name,銀行名稱
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,用戶{0}被禁用
@@ -1788,12 +1788,12 @@
DocType: Purchase Invoice Item,Qty,數量
DocType: Fiscal Year,Companies,企業
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +23,Electronics,電子
-DocType: Email Digest,"Balances of Accounts of type ""Bank"" or ""Cash""",鍵入“銀行”賬戶的餘額或“現金”
+DocType: Email Digest,"Balances of Accounts of type ""Bank"" or ""Cash""",鍵入“銀行”帳戶的餘額或“現金”
DocType: Shipping Rule,"Specify a list of Territories, for which, this Shipping Rule is valid",新界指定一個列表，其中，該運費規則是有效的
DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,對維護期間
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +51,Full-time,全日制
-DocType: Company,Country Settings,國家設置
+DocType: Company,Country Settings,國家設定
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.",如果您已經創建了銷售稅和費模板標準模板，選擇一個，然後點擊下面的按鈕。
@@ -1816,7 +1816,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Credit To account must be a Payable account,信用帳戶必須是應付賬款
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +236,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
DocType: Production Order Operation,Completed Qty,完成數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借記卡賬戶可以對另一記入聯
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,價格表{0}被禁用
DocType: Manufacturing Settings,Allow Overtime,允許加班
apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,銷售訂單{0}被停止
@@ -1845,10 +1845,10 @@
DocType: Purchase Invoice,Considered as Opening Balance,視為期初餘額
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +513,Your Customers,您的客戶
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Compression molding,壓縮成型
-DocType: Leave Block List Date,Block Date,座日期
+DocType: Leave Block List Date,Block Date,封鎖日期
DocType: Sales Order,Not Delivered,未交付
,Bank Clearance Summary,銀行結算摘要
-apps/erpnext/erpnext/config/setup.py +75,"Create and manage daily, weekly and monthly email digests.",創建和管理每日，每週和每月的電子郵件摘要。
+apps/erpnext/erpnext/config/setup.py +75,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,產品編號>項目組>品牌
DocType: Appraisal Goal,Appraisal Goal,考核目標
DocType: Event,Friday,星期五
@@ -1888,7 +1888,7 @@
DocType: Rename Tool,Rename Tool,重命名工具
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +11,Update Cost,更新成本
DocType: Item Reorder,Item Reorder,項目重新排序
-DocType: Address,Check to make primary address,勾選以設定主地址
+DocType: Address,Check to make primary address,勾選以設定主要地址
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +507,Transfer Material,轉印材料
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
DocType: Purchase Invoice,Price List Currency,價格表貨幣
@@ -1929,13 +1929,13 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +108,Pharmaceutical,製藥
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
DocType: Selling Settings,Sales Order Required,銷售訂單需求
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,創建客戶
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,建立客戶
DocType: Purchase Invoice,Credit To,信貸
DocType: Employee Education,Post Graduate,研究生
DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.",注意：備份和文件不會從Dropbox刪除，你必續手動刪除它們。
DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
DocType: Quality Inspection Reading,Reading 9,9閱讀
-DocType: Buying Settings,Buying Settings,求購設置
+DocType: Buying Settings,Buying Settings,採購設定
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,質量精加工
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
DocType: Upload Attendance,Attendance To Date,出席會議日期
@@ -1969,7 +1969,7 @@
DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +124,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
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: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,時事通訊錄
DocType: Delivery Note,Transporter Name,轉運名稱
DocType: Contact,Enter department to which this Contact belongs,輸入聯繫屬於的部門
@@ -1983,7 +1983,7 @@
,Completed Production Orders,已完成生產訂單
DocType: Operation,Default Workstation,默認工作站
DocType: Email Digest,Inventory & Support,庫存與支持
-DocType: Notification Control,Expense Claim Approved Message,報銷批准的消息
+DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
DocType: Email Digest,How frequently?,多久？
DocType: Purchase Receipt,Get Current Stock,獲取當前庫存
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,使安裝注意事項
@@ -2039,23 +2039,23 @@
- 這可以是在淨** **總（即基本量的總和）。
- **以前的行總計/金額**（對於累計稅費）。如果選擇此選項，稅收將與前行的百分比（在稅率表）量或總被應用。
- ** **實際（如前所述）。
- 2。賬戶負責人：該帳戶下的台賬此稅收將被黃牌警告
+ 2。帳戶負責人：該帳戶下的台帳此稅收將被黃牌警告
3。成本中心：如果稅/收費收入（如海運）或費用，它需要對一個成本中心預訂。
4。說明：稅收的說明（將在發票/報價印刷）。
5。速度：稅率。
6。金額：稅額。
7。總計：累積總數達到了這一點。
- 8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基地（默認值是前行）的行號。
+ 8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
9。考慮稅收或收費為：在本節中，你可以指定是否稅/費僅用於評估（總不是部分），或只為總（不增加價值的項目），或兩者兼有。
10。添加或扣除：無論你是想增加或扣除的稅。"
DocType: Note,Note,注釋
DocType: Email Digest,New Material Requests,新物料需求
DocType: Purchase Receipt Item,Recd Quantity,RECD數量
DocType: Email Account,Email Ids,電子郵件ID
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},不能產生更多的項目{0}不是銷售訂單數量{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,設為堵塞通
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,股票輸入{0}不提交
-DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金賬戶
+DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,這請假申請正在等待批准。只有請假審批者可以更新狀態。
DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
@@ -2080,11 +2080,11 @@
sites/assets/js/list.min.js +26,Submitted,提交
DocType: Salary Structure,Total Earning,總盈利
DocType: Purchase Receipt,Time at which materials were received,收到材料在哪個時間
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主。
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主檔。
DocType: Purchase Invoice,Will be calculated automatically when you enter the details,當你輸入詳細信息將自動計算
DocType: Delivery Note,Transporter lorry number,轉運貨車數量
DocType: Sales Order,Billing Status,計費狀態
-DocType: Backup Manager,Backup Right Now,即刻備份
+DocType: Backup Manager,Backup Right Now,立刻備份
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,公用事業費用
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90以上
DocType: Buying Settings,Default Buying Price List,默認情況下採購價格表
@@ -2108,18 +2108,18 @@
DocType: Purchase Order Item,Received Qty,收到數量
DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
DocType: Sales BOM,Parent Item,父項目
-DocType: Account,Account Type,賬戶類型
+DocType: Account,Account Type,帳戶類型
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',維護計畫不會為全部品項生成。請點擊“生成表”
,To Produce,以生產
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",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
-DocType: Packing Slip,Identification of the package for the delivery (for print),送達包裹的識別（用於打印）
+DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼（用於列印）
DocType: Bin,Reserved Quantity,保留數量
DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
DocType: Party Type,Parent Party Type,父方類型
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Cutting,切割
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flattening,壓扁
apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,備份將被上傳到
-DocType: Account,Income Account,收入賬戶
+DocType: Account,Income Account,收入帳戶
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,模
DocType: Stock Reconciliation Item,Current Qty,目前數量
DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",見“率材料基於”在成本核算節
@@ -2129,7 +2129,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,參考
DocType: Cost Center,Cost Center,成本中心
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,＃ ＃＃ ＃，＃＃
-DocType: Notification Control,Purchase Order Message,採購訂單的消息
+DocType: Notification Control,Purchase Order Message,採購訂單的訊息
DocType: Upload Attendance,Upload HTML,上傳HTML
apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Total advance ({0}) against Order {1} cannot be greater \
than the Grand Total ({2})","預付款總額（{0}）反對令{1}不能大於\
@@ -2154,7 +2154,7 @@
apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,管理客戶組樹。
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,新的成本中心名稱
DocType: Leave Control Panel,Leave Control Panel,休假控制面板
-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.,沒有默認的地址找到模板。請創建一個從設置＞印刷與品牌＞地址模板。
+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.,無預設的地址模板。請從設定＞列印與品牌＞地址模板 新增之。
DocType: Appraisal,HR User,HR用戶
DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,問題
@@ -2189,7 +2189,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,員工{0}於{1}休假。不能標記考勤。
DocType: Sales Partner,Targets,目標
-DocType: Price List,Price List Master,價格表大師
+DocType: Price List,Price List Master,價格表主檔
DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
,S.O. No.,SO號
DocType: Production Order Operation,Make Time Log,讓時間日誌
@@ -2197,11 +2197,11 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,電腦
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Electro-chemical grinding,電化學磨
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統通過網絡注技術私人有限公司向提供集成的工具，在一個小的組織管理大多數進程。有關Web註釋，或購買託管楝更多信息，請訪問
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,請設置您的會計科目表你開始會計分錄前
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,開始會計分錄前，請設定您的會計科目表
DocType: Purchase Invoice,Ignore Pricing Rule,忽略定價規則
sites/assets/js/list.min.js +23,Cancelled,註銷
DocType: Employee Education,Graduate,畢業生
-DocType: Leave Block List,Block Days,天座
+DocType: Leave Block List,Block Days,封鎖天數
DocType: Journal Entry,Excise Entry,海關入境
DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2229,11 +2229,11 @@
1。的解決糾紛，賠償，法律責任等
1的方式。地址和公司聯繫。"
DocType: Attendance,Leave Type,休假類型
-apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的賬戶
+apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
DocType: Account,Accounts User,用戶帳戶
DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",檢查經常性發票，取消，停止經常性或將適當的結束日期
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
-DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於打印）
+DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於列印）
apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,最多允許{0}列
DocType: C-Form Invoice Detail,Net Total,總淨值
DocType: Bin,FCFS Rate,FCFS率
@@ -2268,9 +2268,9 @@
DocType: Journal Entry Account,Party Balance,黨平衡
DocType: Sales Invoice Item,Time Log Batch,時間日誌批
apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,請選擇適用的折扣
-DocType: Company,Default Receivable Account,默認情況下應收賬款
-DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,創建銀行進入對支付上述選擇標準，工資總額
-DocType: Item,Item will be saved by this name in the data base.,項目將通過此名稱在數據庫中保存。
+DocType: Company,Default Receivable Account,預設應收帳款
+DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
+DocType: Item,Item will be saved by this name in the data base.,項目將以此名稱在資料庫中保存。
DocType: Stock Entry,Material Transfer for Manufacture,材料轉讓用於製造
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.,折扣百分比可以應用於單一價目表或所有價目表。
DocType: Purchase Invoice,Half-yearly,每半年一次
@@ -2295,7 +2295,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,噴射成形
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,警告：材料要求的數量低於最低起訂量
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,帳戶{0}被凍結
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與賬戶的獨立走勢屬於該組織。
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
apps/erpnext/erpnext/config/setup.py +116,Address master.,地址主人。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,"Food, Beverage & Tobacco",食品、飲料＆煙草
apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
@@ -2340,7 +2340,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Root Type is mandatory,root類型是強制性的
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Serial No {0} created,序列號{0}創建
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Vibratory finishing,震盪整理
-DocType: Item,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在打印格式，如發票和送貨單使用
+DocType: Item,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
DocType: Journal Entry Account,Against Purchase Order,對採購訂單
DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
DocType: Sales Invoice,Advertisement,廣告
@@ -2367,7 +2367,7 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
DocType: Attendance,Attendance Date,考勤日期
DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Account with child nodes cannot be converted to ledger,賬戶與子節點不能轉換到總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
DocType: Address,Preferred Shipping Address,偏好的送貨地址
DocType: Purchase Receipt Item,Accepted Warehouse,收料倉庫
DocType: Bank Reconciliation Detail,Posting Date,發布日期
@@ -2394,7 +2394,7 @@
DocType: Pricing Rule,Purchase Manager,採購經理
DocType: Payment Tool,Payment Tool,支付工具
DocType: Target Detail,Target Detail,目標詳細信息
-DocType: Sales Order,% of materials billed against this Sales Order,％的嘴對這種銷售訂單物料
+DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已出帳物料的百分比(%)
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末進入
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折舊
@@ -2406,7 +2406,7 @@
apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
DocType: GL Entry,Voucher No,無憑證
DocType: Leave Allocation,Leave Allocation,排假
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,'更新庫存“的銷售發票{0}必須設置
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,銷貨發票的'更新庫存'{0}必須設定
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,{0}材料需求創建
apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,模板條款或合同。
DocType: Employee,Feedback,反饋
@@ -2430,7 +2430,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +273,Reference #{0} dated {1},參考＃ {0}於{1}
DocType: Pricing Rule,Item Code,產品編號
DocType: Supplier,Material Manager,材料經理
-DocType: Production Planning Tool,Create Production Orders,創建生產訂單
+DocType: Production Planning Tool,Create Production Orders,建立生產訂單
DocType: Time Log,Costing Rate (per hour),成本率（每小時）
DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
DocType: Journal Entry,User Remark,用戶備註
@@ -2448,15 +2448,15 @@
DocType: Account,Accounts Manager,帳戶管理器
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',時間日誌{0}必須是'提交'
DocType: Stock Settings,Default Stock UOM,默認的庫存計量單位
-DocType: Production Planning Tool,Create Material Requests,創建材料要求
+DocType: Production Planning Tool,Create Material Requests,建立材料需求
DocType: Employee Education,School/University,學校/大學
DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
-,Billed Amount,賬單金額
+,Billed Amount,帳單金額
DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
DocType: Purchase Invoice,Total Amount To Pay,支付總計
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
DocType: Event,Groups,組
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,已帳戶群組
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,以帳戶分群組
DocType: Sales Order,Fully Delivered,完全交付
DocType: Lead,Lower Income,較低的收入
DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",根據責任賬號頭，其中利潤/虧損將被黃牌警告
@@ -2505,7 +2505,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +183,Select Quantity,選擇數量
DocType: Sales Taxes and Charges Template,"Specify a list of Territories, for which, this Taxes Master is valid",新界指定一個列表，其中，該稅金法師是有效的
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.js +41,Message Sent,發送消息
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +41,Message Sent,發送訊息
DocType: Production Plan Sales Order,SO Date,SO日期
DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
@@ -2525,8 +2525,8 @@
DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
DocType: Sales Order,Fully Billed,完全開票
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-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: 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: Serial No,Is Cancelled,被註銷
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,我的出貨量
DocType: Journal Entry,Bill Date,帳單日期
@@ -2543,7 +2543,7 @@
DocType: Newsletter,Create and Send Newsletters,創建和發送簡訊
sites/assets/js/report.min.js +107,From Date must be before To Date,起始日期必須早於終點日期
DocType: Sales Order,Recurring Order,經常訂購
-DocType: Company,Default Income Account,默認情況下收入賬戶
+DocType: Company,Default Income Account,預設之收入帳戶
apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,集團客戶／客戶
DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +189,Welcome to ERPNext,歡迎來到ERPNext
@@ -2560,7 +2560,7 @@
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,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
DocType: Notification Control,Quotation Message,報價信息
DocType: Issue,Opening Date,開幕日期
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +23,POS Setting {0} already created for user: {1} and company {2},POS機設置{0}已創建：{2}公司{1}
+apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +23,POS Setting {0} already created for user: {1} and company {2},POS機設定{0}已新增：{2}公司{1}
DocType: Journal Entry,Remark,備註
DocType: Purchase Receipt Item,Rate and Amount,率及金額
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Boring,無聊
@@ -2588,7 +2588,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,同時接收或傳送資料被允許在數量上的變化百分比。
DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,購物車稅費碩士
-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.",轉到相應的組（通常基金>流動負債>稅和關稅的來源，並創建一個新帳戶（通過點擊輸入“稅”添加兒童），做提稅率。
+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.",轉到相應的群組（通常基金>流動負債>稅和關稅的來源，並新增一個新帳戶（通過點擊輸入“稅”添加兒童），做提稅率。
,Payment Period Based On Invoice Date,基於發票日的付款期
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +113,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Laser cutting,激光切割
@@ -2623,15 +2623,15 @@
DocType: Time Log,Will be updated when billed.,計費時將被更新。
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
-DocType: Sales Invoice,Against Income Account,對收入賬戶
+DocType: Sales Invoice,Against Income Account,對收入帳戶
apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}％交付
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).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
DocType: Territory,Territory Targets,境內目標
DocType: Delivery Note,Transporter Info,轉運信息
DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,採購訂單項目供應商
-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.,標題打印模板例如形式發票。
+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。"
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
DocType: POS Setting,Update Stock,庫存更新
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Superfinishing,超精研
@@ -2641,7 +2641,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,請送貨單拉項目
apps/erpnext/erpnext/accounts/utils.py +235,Journal Entries {0} are un-linked,日記條目{0}都是非聯
DocType: Purchase Invoice,Terms,條款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +235,Create New,創建新
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +235,Create New,新建立
DocType: Buying Settings,Purchase Order Required,購貨訂單要求
,Item-wise Sales History,項目明智的銷售歷史
DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
@@ -2669,10 +2669,10 @@
DocType: Authorization Rule,This will be used for setting rule in HR module,這將用於在人力資源模塊的設置規則
DocType: Account,Rate at which this tax is applied,此稅適用的匯率
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,再訂購數量
-DocType: Company,Stock Adjustment Account,庫存調整賬戶
+DocType: Company,Stock Adjustment Account,庫存調整帳戶
DocType: Sales Invoice,Write Off,抹殺
DocType: Time Log,Operation ID,操作ID
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設置，這將成為默認的所有人力資源的形式。
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：從{1}
DocType: Task,depends_on,depends_on
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +81,Opportunity Lost,失去的機會
@@ -2691,11 +2691,11 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Hard turning,硬車削
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,使維護訪問
apps/erpnext/erpnext/selling/doctype/customer/customer.py +165,Please contact to the user who have Sales Master Manager {0} role,請聯繫，誰擁有碩士學位的銷售經理{0}角色的用戶
-DocType: Company,Default Cash Account,默認的現金賬戶
+DocType: Company,Default Cash Account,預設的現金帳戶
apps/erpnext/erpnext/config/setup.py +91,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Please enter 'Expected Delivery Date',請輸入「預定交付日」
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.",列出你的頭稅（如增值稅，消費稅，他們應該有唯一的名稱）及其標準費率。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than 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}不是對項目的有效批號{1}
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
@@ -2704,7 +2704,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +165,Please enter atleast one attribute row in Item Variants table,請輸入用於至少一個屬性列項異體表
DocType: Opportunity,Opportunity Type,機會型
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,新公司
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +50,Cost Center is required for 'Profit and Loss' account {0},成本中心是必需的“損益”賬戶{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +50,Cost Center is required for 'Profit and Loss' account {0},成本中心是必需的“損益”帳戶{0}
apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +16,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.,不正確的數字總帳條目中找到。你可能會在交易中選擇了錯誤的帳戶。
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,要創建一個銀行帳戶
@@ -2728,7 +2728,7 @@
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
DocType: Pricing Rule,Item Group,項目組
DocType: Task,Actual Start Date (via Time Logs),實際開始日期（通過時間日誌）
-DocType: Stock Reconciliation Item,Before reconciliation,前和解
+DocType: Stock Reconciliation Item,Before reconciliation,對帳前
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
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,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
@@ -2745,7 +2745,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,金屬注射成型
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,從送貨單
DocType: Time Log,From Time,從時間
-DocType: Notification Control,Custom Message,自定義消息
+DocType: Notification Control,Custom Message,自定義訊息
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,投資銀行業務
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency",選擇國家時區和貨幣
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,現金或銀行帳戶是強制性的付款項
@@ -2775,12 +2775,12 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +511,Issue Material,發行材料
DocType: Material Request Item,For Warehouse,對於倉庫
DocType: Employee,Offer Date,到職日期
-DocType: Hub Settings,Access Token,訪問令牌
+DocType: Hub Settings,Access Token,存取 Token
DocType: Sales Invoice Item,Serial No,序列號
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please enter Maintaince Details first,請先輸入維護細節
DocType: Item,Is Fixed Asset Item,是固定資產項目
DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
-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",如果你有很長的打印格式，這個功能可以被用來分割要打印多個頁面，每個頁面上的所有頁眉和頁腳的頁
+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",如果你有很長的列印格式，這個功能可以被用來分割要列印多個頁面，每個頁面上的所有頁眉和頁腳的頁
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Hobbing,滾齒機
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,所有的領土
DocType: Party Type,Party Type Name,黨的類型名稱
@@ -2806,7 +2806,7 @@
DocType: Web Page,Slideshow,連續播放
apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,默認地址模板不能被刪除
DocType: Sales Invoice,Shipping Rule,送貨規則
-DocType: Journal Entry,Print Heading,打印標題
+DocType: Journal Entry,Print Heading,列印標題
DocType: Quotation,Maintenance Manager,維護經理
DocType: Workflow State,Search,搜索
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,總不能為零
@@ -2828,7 +2828,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,附加信
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +244,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
-DocType: Journal Entry,Bank Entry,銀行進入
+DocType: Journal Entry,Bank Entry,銀行分錄
DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
DocType: Blog Post,Blog Post,網誌文章
apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,添加到購物車
@@ -2848,7 +2848,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,轉印材料供應商
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,新的序列號不能有倉庫。倉庫必須由股票輸入或外購入庫單進行設置
DocType: Lead,Lead Type,引線型
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,創建報價
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,建立報價
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,所有這些項目已開具發票
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
@@ -2877,7 +2877,7 @@
,Sales Register,銷售登記
DocType: Quotation,Quotation Lost Reason,報價遺失原因
DocType: Address,Plant,廠
-apps/frappe/frappe/desk/moduleview.py +64,Setup,設置
+apps/frappe/frappe/desk/moduleview.py +64,Setup,設定
apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,對於如1美元= 100美分
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Cold rolling,冷軋
DocType: Customer Group,Customer Group Name,客戶群組名稱
@@ -2892,7 +2892,7 @@
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,製作裝箱單
DocType: Communication,Other,其他
DocType: C-Form,C-Form,C-表
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,操作ID沒有設置
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,操作ID沒有設定
DocType: Production Order,Planned Start Date,計劃開始日期
DocType: Serial No,Creation Document Type,創建文件類型
DocType: Leave Type,Is Encash,為兌現
@@ -2917,7 +2917,7 @@
DocType: Opportunity,Sales,銷售
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},需要現貨產品倉庫{0}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Cr,鉻
-DocType: Customer,Default Receivable Accounts,默認應收賬款
+DocType: Customer,Default Receivable Accounts,預設應收帳款
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Sawing,鋸切
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Laminating,層壓
DocType: Item Reorder,Transfer,轉讓
@@ -2956,7 +2956,7 @@
DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如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),臨時溢利/（虧損）（信用）
-apps/erpnext/erpnext/accounts/utils.py +243,Please set default value {0} in Company {1},請設置在公司默認值{0} {1}
+apps/erpnext/erpnext/accounts/utils.py +243,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0}
DocType: Serial No,Creation Time,創作時間
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,總收入
,Monthly Attendance Sheet,每月考勤表
@@ -2967,21 +2967,21 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
DocType: Sales Team,Contact No.,聯絡電話
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”賬戶類型{0}不開放允許入境
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
DocType: Workflow State,Time,時間
DocType: Features Setup,Sales Discounts,銷售折扣
DocType: Hub Settings,Seller Country,賣家國家
DocType: Authorization Rule,Authorization Rule,授權規則
DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,產品規格
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用模板
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,服裝及配飾
DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.",如果股票的強制性項目為“是”。也是默認倉庫，保留數量從銷售訂單設置。
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,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,指定條件來計算運費金額
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,添加子項目
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,角色允許設置凍結帳戶和編輯冷凍項
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結帳戶和編輯凍結分錄的角色
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬，因為它有子節點
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,轉換係數是必需的
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +32,Serial #,序列號
@@ -3001,17 +3001,17 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律費用
DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",該月的一天，在這汽車的訂單將產生如05，28等
DocType: Sales Invoice,Posting Time,發布時間
-DocType: Sales Order,% Amount Billed,（％）金額帳單
+DocType: Sales Order,% Amount Billed,（％）金額已開立帳單
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,電話費
DocType: Sales Partner,Logo,標誌
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0}所需的物品序列號{0} 。只有{0}提供。
-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.,如果要強制用戶在保存之前選擇了一系列檢查。將不會有默認的，如果你檢查這個。
+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 +108,No Item with Serial No {0},沒有序號{0}的品項
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接費用
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +645,Do you really want to UNSTOP this Material Request?,難道你真的想要UNSTOP此材料要求？
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 +132,Travel Expenses,差旅費
-DocType: Maintenance Visit,Breakdown,擊穿
+DocType: Maintenance Visit,Breakdown,展開
DocType: Bank Reconciliation Detail,Cheque Date,支票日期
apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
apps/erpnext/erpnext/setup/doctype/company/company.js +33,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
@@ -3030,7 +3030,8 @@
DocType: Project,Total Billing Amount (via Time Logs),總結算金額（通過時間日誌）
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +577,We sell this Item,我們賣這種產品
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Supplier Id,供應商編號
-DocType: Journal Entry,Cash Entry,現金入境
+DocType: Journal Entry,Cash Entry,"現金分錄
+"
DocType: Sales Partner,Contact Desc,聯繫倒序
apps/erpnext/erpnext/stock/doctype/item/item.py +190,Item Variants {0} created,項目變種{0}創建
apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",葉似漫不經心，生病等類型
@@ -3049,7 +3050,7 @@
DocType: Item Attribute Value,Abbreviation,縮寫
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Rotational molding,滾塑成型
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪資模板大師。
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪資套版主檔。
DocType: Leave Type,Max Days Leave Allowed,允許的最長休假天
DocType: Payment Tool,Set Matching Amounts,設置相同的金額
DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
@@ -3070,7 +3071,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,秘書
DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
apps/erpnext/erpnext/config/setup.py +96,Item master.,項目主。
-DocType: Pricing Rule,Buying,求購
+DocType: Pricing Rule,Buying,採購
DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,此時日誌批次已被取消。
DocType: Purchase Invoice,Apply Discount On,申請折扣
@@ -3169,7 +3170,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},注： {0}
,Delivery Note Trends,送貨單趨勢
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0}必須是購買或分包項目中列{1}
-apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,賬號：{0}只能通過股票的交易進行更新
+apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
DocType: GL Entry,Party,黨
DocType: Sales Order,Delivery Date,交貨日期
DocType: DocField,Currency,貨幣
@@ -3183,16 +3184,16 @@
DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
DocType: Department,Leave 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,項{0}不是設置為序列號列必須為空白
-DocType: Accounts Settings,Accounts Settings,賬戶設置
+DocType: Accounts Settings,Accounts Settings,帳戶設定
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,廠房及機器
DocType: Item,You can enter the minimum quantity of this item to be ordered.,您可以輸入資料到訂購的最小數量。
DocType: Sales Partner,Partner's Website,合作夥伴的網站
DocType: Opportunity,To Discuss,為了討論
DocType: SMS Settings,SMS Settings,短信設置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,臨時賬戶
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,臨時帳戶
DocType: Payment Tool,Column Break 1,分欄符1
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,黑
-DocType: BOM Explosion Item,BOM Explosion Item,BOM爆炸物品
+DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
DocType: Account,Auditor,核數師
DocType: Purchase Order,End date of current order's period,當前訂單的週期的最後一天
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使錄取通知書
@@ -3208,7 +3209,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,銷售訂單{0}未提交
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：家長帳戶{1}不博隆該公司{2}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,主軸整理
-DocType: Material Request,% of materials ordered against this Material Request,％的下令對這種材料申請材料
+DocType: Material Request,% of materials ordered against this Material Request,此物料需求已有 ％ 物料已下單
DocType: BOM,Last Purchase Rate,最後預訂價
DocType: Account,Asset,財富
DocType: Project Task,Task ID,任務ID
@@ -3220,7 +3221,7 @@
apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即註冊ERPNext中心
DocType: Monthly Distribution,Monthly Distribution Percentages,每月分佈百分比
apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所選項目不能批
-DocType: Delivery Note,% of materials delivered against this Delivery Note,％的交付對本送貨單材料
+DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單 ％ 的物料已交貨
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stapling,裝訂
DocType: Customer,Customer Details,客戶詳細信息
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Shaping,成型
@@ -3265,7 +3266,7 @@
DocType: Job Applicant,Applicant Name,申請人名稱
DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
-sites/assets/js/desk.min.js +536,Created By,創建人
+sites/assets/js/desk.min.js +536,Created By,建立者
DocType: Serial No,Under AMC,在AMC
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
apps/erpnext/erpnext/config/selling.py +65,Default settings for selling transactions.,默認設置為賣出交易。
@@ -3279,7 +3280,7 @@
DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",自動設置。如果此項目已變種，那麼它不能在銷售訂單等選擇
DocType: Workstation,per hour,每小時
apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},系列{0}已經被應用在{1}
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,賬戶倉庫（永續盤存）將在該帳戶下創建。
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,股票分類帳項存在這個倉庫倉庫不能被刪除。
DocType: Company,Distribution,分配
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,專案經理
@@ -3331,7 +3332,7 @@
DocType: Salary Slip,Salary Slip,工資單
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,打磨
DocType: Features Setup,To enable <b>Point of Sale</b> view,為了使<b>銷售點</b>看法
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“至今”是必需的
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'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.",生成裝箱單的包裹交付。用於通知包號，包的內容和它的重量。
DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
DocType: Salary Slip,Payment Days,付款日
@@ -3361,7 +3362,7 @@
apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文檔。
DocType: Account,Chargeable,收費
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Linishing,Linishing
-DocType: Company,Change Abbreviation,變化縮寫
+DocType: Company,Change Abbreviation,更改縮寫
DocType: Workflow State,Primary,主要的
DocType: Expense Claim Detail,Expense Date,犧牲日期
DocType: Item,Max Discount (%),最大折讓（％）
@@ -3463,7 +3464,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +376,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +66,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Electron beam machining,電子束加工
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購經理大師
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,生產訂單{0}必須提交
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +160,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
apps/erpnext/erpnext/config/stock.py +141,Main Reports,主報告
@@ -3476,7 +3477,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,我的訂單
DocType: Price List,Price List Name,價格列表名稱
DocType: Time Log,For Manufacturing,對於製造業
-DocType: BOM,Manufacturing,製造業
+DocType: BOM,Manufacturing,製造
,Ordered Items To Be Delivered,訂購項目交付
DocType: Account,Income,收入
,Setup Wizard,設置嚮導
@@ -3509,7 +3510,7 @@
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",數值越低，優先級越高的，將這個項目屬性的變項創建的項目代碼後綴
,Serial No Service Contract Expiry,序號服務合同到期
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employee can not be changed,僱員不能改變
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,你無法信用卡和借記同一賬戶在同一時間
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
DocType: Naming Series,Help HTML,HTML幫助
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
@@ -3545,14 +3546,14 @@
apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新的額外成本來計算項目的到岸成本
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +106,Electrical,電子的
DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',差別賬戶強制性目標“{0}”
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',差別帳戶強制性目標“{0}”
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Peening,噴丸
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,從保修索賠
DocType: Stock Entry,Default Source Warehouse,默認信號源倉庫
DocType: Item,Customer Code,客戶代碼
apps/erpnext/erpnext/hr/doctype/employee/employee.py +203,Birthday Reminder for {0},生日提醒{0}
-DocType: Item,Default Purchase Account in which cost of the item will be debited.,默認帳戶購買該項目的成本將被扣除。
+DocType: Item,Default Purchase Account in which cost of the item will be debited.,預設帳戶購買該項目的成本將被扣除。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Lapping,精研
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,天自上次訂購
DocType: Buying Settings,Naming Series,命名系列
@@ -3572,7 +3573,7 @@
apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動／任務。
apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工資條
apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0}不是一個有效的電子郵件ID
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",求購必須進行檢查，如果適用於被選擇為{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"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: ToDo,Low,低
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Spinning,紡織
@@ -3604,7 +3605,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +46,Show Balance,展會平衡
DocType: Item,"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 +143,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
@@ -3612,7 +3613,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Riveting,鉚
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
,Sales Analytics,銷售分析
-DocType: Manufacturing Settings,Manufacturing Settings,製造設置
+DocType: Manufacturing Settings,Manufacturing Settings,製造設定
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Please enter default currency in Company Master,請在公司主輸入默認貨幣
DocType: Stock Entry Detail,Stock Entry Detail,庫存輸入明細
apps/erpnext/erpnext/templates/includes/cart.js +286,You need to be logged in to view your cart.,您需要登錄才能查看您的購物車。
@@ -3627,7 +3628,7 @@
apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,默認設置的會計事務。
apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必需的
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,真空成型
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,消息大於160個字符將會被分成多個消息
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
DocType: Contact Us Settings,City,城市
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,超聲波加工
apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
@@ -3639,7 +3640,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},於列{0}需要產品編號
DocType: Sales Partner,Partner Type,合作夥伴類型
DocType: Purchase Taxes and Charges,Actual,實際
-DocType: Purchase Order,% of materials received against this Purchase Order,％的材料收到反對這個採購訂單
+DocType: Purchase Order,% of materials received against this Purchase Order,此採購訂單已有 % 的物料已收料
DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
DocType: Purchase Invoice,Against Expense Account,對費用帳戶
DocType: Production Order,Production Order,生產訂單
@@ -3690,7 +3691,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Consulting,諮詢
DocType: Customer Group,Parent Customer Group,母公司集團客戶
-sites/assets/js/erpnext.min.js +45,Change,變化
+sites/assets/js/erpnext.min.js +45,Change,更改
DocType: Purchase Invoice,Contact Email,聯絡電郵
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Purchase Order {0} is 'Stopped',採購訂單{0}是「停止」的
DocType: Appraisal Goal,Score Earned,獲得得分
@@ -3710,7 +3711,7 @@
DocType: Item,Default Warehouse,默認倉庫
DocType: Task,Actual End Date (via Time Logs),實際結束日期（通過時間日誌）
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,請輸入父成本中心
-DocType: Delivery Note,Print Without Amount,打印量不
+DocType: Delivery Note,Print Without Amount,列印但不印數量
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,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
DocType: User,Last Name,姓
DocType: Web Page,Left,左
@@ -3758,7 +3759,7 @@
DocType: Sales Invoice,Rounded Total (Company Currency),圓潤的總計（公司貨幣）
apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
DocType: Purchase Common,Purchase Common,採購普通
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1}已被修改。請刷新。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/selling/doctype/quotation/quotation.js +626,From Opportunity,從機會
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,消隱
@@ -3780,7 +3781,7 @@
DocType: GL Entry,Voucher Type,憑證類型
DocType: Expense Claim,Approved,批准
DocType: Pricing Rule,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設置為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",選擇“Yes”將提供一個獨特的身份，以這個項目的每個實體可在序列號主觀看。
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
DocType: Employee,Education,教育
@@ -3813,12 +3814,12 @@
DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
DocType: Notification Control,Purchase Receipt Message,外購入庫單信息
DocType: Production Order,Actual Start Date,實際開始日期
-DocType: Sales Order,% of materials delivered against this Sales Order,％的交付對這個銷售訂單物料
+DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
apps/erpnext/erpnext/config/stock.py +18,Record item movement.,記錄項目移動。
DocType: Newsletter List Subscriber,Newsletter List Subscriber,通訊訂戶名單
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Morticing
DocType: Email Account,Service,服務
-DocType: Hub Settings,Hub Settings,中心設置
+DocType: Hub Settings,Hub Settings,中心設定
DocType: Project,Gross Margin %,毛利率％
DocType: BOM,With Operations,隨著運營
,Monthly Salary Register,月薪註冊
@@ -3829,7 +3830,7 @@
DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
DocType: Email Digest,New Delivery Notes,新交付票據
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +30,Please enter Payment Amount in atleast one row,請ATLEAST一行輸入付款金額
-apps/erpnext/erpnext/templates/pages/tickets.py +34,Please write something in subject and message!,請寫東西的主題和消息！
+apps/erpnext/erpnext/templates/pages/tickets.py +34,Please write something in subject and message!,請在主題和訊息中寫些東西！
apps/erpnext/erpnext/config/accounts.py +143,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +190,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金額不能大於傑出金額
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,時間日誌是不計費
@@ -3858,13 +3859,13 @@
DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維繫家庭的詳細信息，如姓名的父母，配偶和子女及職業
DocType: Hub Settings,Seller Name,賣家名稱
DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
-DocType: Item Group,General Settings,常規設置
+DocType: Item Group,General Settings,一般設定
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
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/setup/page/setup_wizard/setup_wizard.js +480,Attach Logo,附加標誌
DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部門封鎖離開申請。
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部門封鎖請假申請。
DocType: Production Order,Actual Operating Cost,實際運行成本
apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Root cannot be edited.,root不能被編輯。
apps/erpnext/erpnext/accounts/utils.py +188,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 49cdd83..7cb8d82 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -112,7 +112,7 @@
},
{
"default": "0",
- "description": "Check to make primary address",
+ "description": "",
"fieldname": "is_primary_address",
"fieldtype": "Check",
"label": "Preferred Billing Address",
@@ -120,7 +120,7 @@
},
{
"default": "0",
- "description": "Check to make Shipping Address",
+ "description": "",
"fieldname": "is_shipping_address",
"fieldtype": "Check",
"in_list_view": 0,
@@ -199,7 +199,7 @@
"icon": "icon-map-marker",
"idx": 1,
"in_dialog": 0,
- "modified": "2015-02-20 05:07:56.567822",
+ "modified": "2015-06-01 06:42:18.331818",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Address",
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index 1592d22..b3f6717 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py
@@ -21,6 +21,8 @@
throw(_("Address Title is mandatory."))
def validate(self):
+ self.link_fields = ("customer", "supplier", "sales_partner", "lead")
+ self.link_address()
self.validate_primary_address()
self.validate_shipping_address()
@@ -30,7 +32,7 @@
self._unset_other("is_primary_address")
elif self.is_shipping_address != 1:
- for fieldname in ["customer", "supplier", "sales_partner", "lead"]:
+ for fieldname in self.link_fields:
if self.get(fieldname):
if not frappe.db.sql("""select name from `tabAddress` where is_primary_address=1
and `%s`=%s and name!=%s""" % (fieldname, "%s", "%s"),
@@ -38,6 +40,24 @@
self.is_primary_address = 1
break
+ def link_address(self):
+ """Link address based on owner"""
+ linked = False
+ for fieldname in self.link_fields:
+ if self.get(fieldname):
+ linked = True
+ break
+
+ if not linked:
+ contact = frappe.db.get_value("Contact", {"email_id": self.owner},
+ ("name", "customer", "supplier"), as_dict = True)
+ if contact:
+ self.customer = contact.customer
+ self.supplier = contact.supplier
+
+ self.lead = frappe.db.get_value("Lead", {"email_id": self.owner})
+
+
def validate_shipping_address(self):
"""Validate that there can only be one shipping address for particular customer, supplier"""
if self.is_shipping_address == 1:
@@ -84,5 +104,22 @@
return territory
+def get_list_context(context=None):
+ from erpnext.shopping_cart.cart import get_address_docs
+ return {
+ "title": _("My Addresses"),
+ "get_list": get_address_docs,
+ "row_template": "templates/includes/address_row.html",
+ }
+def has_website_permission(doc, ptype, user, verbose=False):
+ """Returns true if customer or lead matches with user"""
+ customer = frappe.db.get_value("Contact", {"email_id": frappe.session.user}, "customer")
+ if customer:
+ return doc.customer == customer
+ else:
+ lead = frappe.db.get_value("Lead", {"email_id": frappe.session.user})
+ if lead:
+ return doc.lead == lead
+ return False
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index c71ed60..d2296ca 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -75,7 +75,7 @@
"permlevel": 0
},
{
- "depends_on": "eval:!doc.supplier && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "customer",
"fieldtype": "Link",
"label": "Customer",
@@ -86,7 +86,7 @@
"print_hide": 0
},
{
- "depends_on": "eval:!doc.supplier && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "customer_name",
"fieldtype": "Data",
"in_list_view": 0,
@@ -102,7 +102,7 @@
"width": "50%"
},
{
- "depends_on": "eval:!doc.customer && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "supplier",
"fieldtype": "Link",
"label": "Supplier",
@@ -111,7 +111,7 @@
},
{
"allow_on_submit": 0,
- "depends_on": "eval:!doc.customer && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "supplier_name",
"fieldtype": "Data",
"in_list_view": 0,
@@ -120,7 +120,7 @@
"read_only": 1
},
{
- "depends_on": "eval:!doc.customer && !doc.supplier",
+ "depends_on": "",
"fieldname": "sales_partner",
"fieldtype": "Link",
"label": "Sales Partner",
@@ -177,7 +177,7 @@
"idx": 1,
"in_create": 0,
"in_dialog": 0,
- "modified": "2015-03-18 07:06:43.906702",
+ "modified": "2015-07-09 08:15:29.026935",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Contact",
diff --git a/erpnext/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
index 4158d75..314014f 100644
--- a/erpnext/utilities/doctype/contact/contact.py
+++ b/erpnext/utilities/doctype/contact/contact.py
@@ -66,5 +66,4 @@
"contact_designation": contact.get("designation"),
"contact_department": contact.get("department")
}
-
return out
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 9c73c60..50b0319 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from frappe.utils import cstr, now_datetime, cint
+from frappe.utils import cstr, now_datetime, cint, flt
import frappe.share
from erpnext.controllers.status_updater import StatusUpdater
@@ -22,16 +22,21 @@
self.posting_time = now_datetime().strftime('%H:%M:%S')
def add_calendar_event(self, opts, force=False):
- if self.contact_by != cstr(self._prev.contact_by) or \
- self.contact_date != cstr(self._prev.contact_date) or force:
+ if cstr(self.contact_by) != cstr(self._prev.contact_by) or \
+ cstr(self.contact_date) != cstr(self._prev.contact_date) or force:
self.delete_events()
self._add_calendar_event(opts)
def delete_events(self):
- frappe.delete_doc("Event", frappe.db.sql_list("""select name from `tabEvent`
- where ref_type=%s and ref_name=%s""", (self.doctype, self.name)),
- ignore_permissions=True)
+ events = frappe.db.sql_list("""select name from `tabEvent`
+ where ref_type=%s and ref_name=%s""", (self.doctype, self.name))
+ if events:
+ frappe.db.sql("delete from `tabEvent` where name in (%s)"
+ .format(", ".join(['%s']*len(events))), tuple(events))
+
+ frappe.db.sql("delete from `tabEvent Role` where parent in (%s)"
+ .format(", ".join(['%s']*len(events))), tuple(events))
def _add_calendar_event(self, opts):
opts = frappe._dict(opts)
@@ -51,7 +56,8 @@
event.insert(ignore_permissions=True)
if frappe.db.exists("User", self.contact_by):
- frappe.share.add("Event", event.name, self.contact_by)
+ frappe.share.add("Event", event.name, self.contact_by,
+ flags={"ignore_share_permission": True})
def validate_uom_is_integer(self, uom_field, qty_fields):
validate_uom_is_integer(self, uom_field, qty_fields)
@@ -86,6 +92,17 @@
for field, condition in fields:
if prevdoc_values[field] is not None:
self.validate_value(field, condition, prevdoc_values[field], doc)
+
+
+ def validate_rate_with_reference_doc(self, ref_details):
+ for ref_dt, ref_dn_field, ref_link_field in ref_details:
+ for d in self.get("items"):
+ if d.get(ref_link_field):
+ ref_rate = frappe.db.get_value(ref_dt + " Item", d.get(ref_link_field), "rate")
+
+ if abs(flt(d.rate - ref_rate, d.precision("rate"))) >= .01:
+ frappe.throw(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
+ .format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate))
def delete_events(ref_type, ref_name):
diff --git a/setup.py b/setup.py
index 669c901..e7702e4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "5.0.5"
+version = "5.1.6"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()
diff --git a/sponsors.md b/sponsors.md
new file mode 100644
index 0000000..7578229
--- /dev/null
+++ b/sponsors.md
@@ -0,0 +1,25 @@
+## Sponsors
+
+
+#### General
+
+- [CWT (Connector & Wire Technology GmbH)](http://www.cwt-assembly.com/) (2013)
+- [Pinnacle GIS](http://pinnaclegis.com.au/) (2014)
+- [Rohit Industries](www.rigpl.com) (2014)
+
+
+#### Features
+
+<table style="width: 100%">
+ <tbody>
+ <tr>
+ <td style="width: 30%">
+ <a href="http://www.mcleans.net.au">McLean Images</a>
+ </td>
+ <td>
+ For credit period setting options
+ for Customer <a href="https://github.com/frappe/erpnext/issues/3451">#3451</a>
+ </td>
+ </tr>
+ </tbody>
+</table>
diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json
index 96f3446..7d1194a 100644
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json
@@ -1,10 +1,12 @@
{
"db_name": "test_frappe",
"db_password": "test_frappe",
+ "auto_email_id": "test@example.com",
+ "mail_server": "smtp.example.com",
+ "mail_login": "test@example.com",
+ "mail_password": "test",
"admin_password": "admin",
- "auto_email_id": "admin@example.com",
- "host_name": "http://localhost:8888",
- "auto_email_id": "admin@example.com",
- "mute_emails": 1,
+ "run_selenium_tests": 1,
+ "host_name": "http://localhost:8000",
"install_apps": ["erpnext"]
}
