Code replacement for journal voucher renaming
diff --git a/erpnext/accounts/README.md b/erpnext/accounts/README.md
index 10a99e5..da1f201 100644
--- a/erpnext/accounts/README.md
+++ b/erpnext/accounts/README.md
@@ -6,7 +6,7 @@
Entries are:
-- Journal Vouchers
+- Journal Entries
- Sales Invoice (Itemised)
- Purchase Invoice (Itemised)
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
index 72ab425..b4e8f1d 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -3,7 +3,7 @@
cur_frm.cscript.onload = function(doc, cdt, cdn){
cur_frm.set_intro('<i class="icon-question" /> ' +
- __("Update clearance date of Journal Entries marked as 'Bank Vouchers'"));
+ __("Update clearance date of Journal Entries marked as 'Bank Entry'"));
cur_frm.add_fetch("bank_account", "company", "company");
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index 63f54a7..b7c6cbf 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -21,7 +21,7 @@
dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit,
t2.credit, t1.posting_date, t2.against_account, t1.clearance_date
from
- `tabJournal Voucher` t1, `tabJournal Entry Account` t2
+ `tabJournal Entry` t1, `tabJournal Entry Account` t2
where
t2.parent = t1.name and t2.account = %s
and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1
@@ -50,8 +50,8 @@
if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
frappe.throw(_("Clearance date cannot be before check date in row {0}").format(d.idx))
- frappe.db.set_value("Journal Voucher", d.voucher_id, "clearance_date", d.clearance_date)
- frappe.db.sql("""update `tabJournal Voucher` set clearance_date = %s, modified = %s
+ frappe.db.set_value("Journal Entry", d.voucher_id, "clearance_date", d.clearance_date)
+ frappe.db.sql("""update `tabJournal Entry` set clearance_date = %s, modified = %s
where name=%s""", (d.clearance_date, nowdate(), d.voucher_id))
vouchers.append(d.voucher_id)
diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
index 250dc45..7cdb071 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -11,7 +11,7 @@
"no_copy": 0,
"oldfieldname": "voucher_id",
"oldfieldtype": "Link",
- "options": "Journal Voucher",
+ "options": "Journal Entry",
"permlevel": 0,
"search_index": 0
},
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index 787d1db..49893da 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -25,7 +25,7 @@
validate_balance_type(self.account, adv_adj)
# Update outstanding amt on against voucher
- if self.against_voucher_type in ['Journal Voucher', 'Sales Invoice', 'Purchase Invoice'] \
+ if self.against_voucher_type in ['Journal Entry', 'Sales Invoice', 'Purchase Invoice'] \
and self.against_voucher and update_outstanding == 'Yes':
update_outstanding_amt(self.account, self.party_type, self.party, self.against_voucher_type,
self.against_voucher)
@@ -123,15 +123,15 @@
if against_voucher_type == 'Purchase Invoice':
bal = -bal
- elif against_voucher_type == "Journal Voucher":
+ elif against_voucher_type == "Journal Entry":
against_voucher_amount = flt(frappe.db.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
- from `tabGL Entry` where voucher_type = 'Journal Voucher' and voucher_no = %s
+ 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])
if not against_voucher_amount:
- frappe.throw(_("Against Journal Voucher {0} is already adjusted against some other voucher")
+ frappe.throw(_("Against Journal Entry {0} is already adjusted against some other voucher")
.format(against_voucher))
bal = against_voucher_amount + bal
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index bf694b0..a28ab36 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -68,7 +68,7 @@
frappe.model.validate_missing(jvd, "account");
return {
- query: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_against_jv",
+ query: "erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv",
filters: {
account: jvd.account,
party: jvd.party
@@ -109,7 +109,7 @@
against_jv: function(doc, cdt, cdn) {
var d = frappe.get_doc(cdt, cdn);
if (d.against_jv && d.party && !flt(d.credit) && !flt(d.debit)) {
- this.get_outstanding('Journal Voucher', d.against_jv, d);
+ this.get_outstanding('Journal Entry', d.against_jv, d);
}
},
@@ -216,12 +216,12 @@
cur_frm.pformat.print_heading = doc.select_print_heading;
}
else
- cur_frm.pformat.print_heading = __("Journal Voucher");
+ cur_frm.pformat.print_heading = __("Journal Entry");
}
cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
- cur_frm.set_df_property("cheque_no", "reqd", doc.voucher_type=="Bank Voucher");
- cur_frm.set_df_property("cheque_date", "reqd", doc.voucher_type=="Bank Voucher");
+ cur_frm.set_df_property("cheque_no", "reqd", doc.voucher_type=="Bank Entry");
+ cur_frm.set_df_property("cheque_date", "reqd", doc.voucher_type=="Bank Entry");
if((doc.entries || []).length!==0 || !doc.company) // too early
return;
@@ -236,10 +236,10 @@
refresh_field("entries");
}
- if(in_list(["Bank Voucher", "Cash Voucher"], doc.voucher_type)) {
+ if(in_list(["Bank Entry", "Cash Entry"], doc.voucher_type)) {
return frappe.call({
type: "GET",
- method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
args: {
"voucher_type": doc.voucher_type,
"company": doc.company
@@ -253,7 +253,7 @@
} else if(doc.voucher_type=="Opening Entry") {
return frappe.call({
type:"GET",
- method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_opening_accounts",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts",
args: {
"company": doc.company
},
@@ -272,7 +272,7 @@
var d = frappe.get_doc(cdt, cdn);
if(!d.account && d.party_type && d.party) {
return frm.call({
- method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_party_account_and_balance",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_party_account_and_balance",
child: d,
args: {
company: frm.doc.company,
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 172c315..fd8816c 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -101,7 +101,7 @@
.format(date_diff - flt(credit_days), d.party_type, d.party))
def validate_cheque_info(self):
- if self.voucher_type in ['Bank Voucher']:
+ if self.voucher_type in ['Bank Entry']:
if not self.cheque_no or not self.cheque_date:
msgprint(_("Reference No & Reference Date is required for {0}").format(self.voucher_type),
raise_exception=1)
@@ -131,7 +131,7 @@
.format(d.account))
if d.against_jv == self.name:
- frappe.throw(_("You can not enter current voucher in 'Against Journal Voucher' column"))
+ frappe.throw(_("You can not enter current voucher in 'Against Journal Entry' column"))
against_entries = frappe.db.sql("""select * from `tabJournal Entry Account`
where account = %s and docstatus = 1 and parent = %s
@@ -139,7 +139,7 @@
and ifnull(against_voucher, '') = ''""", (d.account, d.against_jv), as_dict=True)
if not against_entries:
- frappe.throw(_("Journal Voucher {0} does not have account {1} or already matched against other voucher")
+ frappe.throw(_("Journal Entry {0} does not have account {1} or already matched against other voucher")
.format(d.against_jv, d.account))
else:
dr_or_cr = "debit" if d.credit > 0 else "credit"
@@ -148,7 +148,7 @@
if flt(jvd[dr_or_cr]) > 0:
valid = True
if not valid:
- frappe.throw(_("Against Journal Voucher {0} does not have any unmatched {1} entry")
+ frappe.throw(_("Against Journal Entry {0} does not have any unmatched {1} entry")
.format(d.against_jv, dr_or_cr))
def validate_against_sales_invoice(self):
@@ -345,7 +345,7 @@
"credit": flt(d.credit, self.precision("credit", "entries")),
"against_voucher_type": (("Purchase Invoice" if d.against_voucher else None)
or ("Sales Invoice" if d.against_invoice else None)
- or ("Journal Voucher" if d.against_jv else None)
+ or ("Journal Entry" if d.against_jv else None)
or ("Sales Order" if d.against_sales_order else None)
or ("Purchase Order" if d.against_purchase_order else None)),
"against_voucher": d.against_voucher or d.against_invoice or d.against_jv
@@ -444,7 +444,7 @@
@frappe.whitelist()
def get_default_bank_cash_account(company, voucher_type):
account = frappe.db.get_value("Company", company,
- voucher_type=="Bank Voucher" and "default_bank_account" or "default_cash_account")
+ voucher_type=="Bank Entry" and "default_bank_account" or "default_cash_account")
if account:
return {
"account": account,
@@ -493,10 +493,10 @@
return jv.as_dict()
def get_payment_entry(doc):
- bank_account = get_default_bank_cash_account(doc.company, "Bank Voucher")
+ bank_account = get_default_bank_cash_account(doc.company, "Bank Entry")
- jv = frappe.new_doc('Journal Voucher')
- jv.voucher_type = 'Bank Voucher'
+ jv = frappe.new_doc('Journal Entry')
+ jv.voucher_type = 'Bank Entry'
jv.company = doc.company
jv.fiscal_year = doc.fiscal_year
@@ -520,7 +520,7 @@
def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
- from `tabJournal Voucher` jv, `tabJournal Entry Account` jv_detail
+ 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
and (ifnull(jvd.against_invoice, '') = '' and ifnull(jvd.against_voucher, '') = '' and ifnull(jvd.against_jv, '') = '' )
and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield),
@@ -529,7 +529,7 @@
@frappe.whitelist()
def get_outstanding(args):
args = eval(args)
- if args.get("doctype") == "Journal Voucher" and args.get("party"):
+ if args.get("doctype") == "Journal Entry" and args.get("party"):
against_jv_amount = frappe.db.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabJournal Entry Account` where parent=%s and party=%s
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry_list.js b/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
index 06d578a..42d7032 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
@@ -1,3 +1,3 @@
-frappe.listview_settings['Journal Voucher'] = {
+frappe.listview_settings['Journal Entry'] = {
add_fields: ["voucher_type", "posting_date", "total_debit", "company"]
};
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index 410f22f..5c91228 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -6,7 +6,7 @@
from frappe.utils import flt
class TestJournalEntry(unittest.TestCase):
- def test_journal_voucher_with_against_jv(self):
+ def test_journal_entry_with_against_jv(self):
jv_invoice = frappe.copy_doc(test_records[2])
base_jv = frappe.copy_doc(test_records[0])
@@ -29,8 +29,8 @@
self.jv_against_voucher_testcase(base_jv, purchase_order)
def jv_against_voucher_testcase(self, base_jv, test_voucher):
- dr_or_cr = "credit" if test_voucher.doctype in ["Sales Order", "Journal Voucher"] else "debit"
- field_dict = {'Journal Voucher': "against_jv",
+ dr_or_cr = "credit" if test_voucher.doctype in ["Sales Order", "Journal Entry"] else "debit"
+ field_dict = {'Journal Entry': "against_jv",
'Sales Order': "against_sales_order",
'Purchase Order': "against_purchase_order"
}
@@ -39,7 +39,7 @@
test_voucher.insert()
test_voucher.submit()
- if test_voucher.doctype == "Journal Voucher":
+ if test_voucher.doctype == "Journal Entry":
self.assertTrue(frappe.db.sql("""select name from `tabJournal Entry Account`
where account = %s and docstatus = 1 and parent = %s""",
("_Test Receivable - _TC", test_voucher.name)))
@@ -73,8 +73,8 @@
self.assertTrue(flt(advance_paid[0][0]) == flt(payment_against_order))
def cancel_against_voucher_testcase(self, test_voucher):
- if test_voucher.doctype == "Journal Voucher":
- # if test_voucher is a Journal Voucher, test cancellation of test_voucher
+ if test_voucher.doctype == "Journal Entry":
+ # if test_voucher is a Journal Entry, test cancellation of test_voucher
test_voucher.cancel()
self.assertTrue(not frappe.db.sql("""select name from `tabJournal Entry Account`
where against_jv=%s""", test_voucher.name))
@@ -114,7 +114,7 @@
jv.insert()
jv.submit()
self.assertTrue(frappe.db.get_value("GL Entry",
- {"voucher_type": "Journal Voucher", "voucher_no": jv.name}))
+ {"voucher_type": "Journal Entry", "voucher_no": jv.name}))
def test_monthly_budget_crossed_stop(self):
from erpnext.accounts.utils import BudgetError
@@ -168,7 +168,7 @@
jv.submit()
self.assertTrue(frappe.db.get_value("GL Entry",
- {"voucher_type": "Journal Voucher", "voucher_no": jv.name}))
+ {"voucher_type": "Journal Entry", "voucher_no": jv.name}))
jv1 = frappe.copy_doc(test_records[0])
jv1.get("entries")[1].account = "_Test Account Cost for Goods Sold - _TC"
@@ -178,7 +178,7 @@
jv1.submit()
self.assertTrue(frappe.db.get_value("GL Entry",
- {"voucher_type": "Journal Voucher", "voucher_no": jv1.name}))
+ {"voucher_type": "Journal Entry", "voucher_no": jv1.name}))
self.assertRaises(BudgetError, jv.cancel)
@@ -188,4 +188,4 @@
frappe.db.sql("""delete from `tabGL Entry`""")
-test_records = frappe.get_test_records('Journal Voucher')
+test_records = frappe.get_test_records('Journal Entry')
diff --git a/erpnext/accounts/doctype/journal_entry/test_records.json b/erpnext/accounts/doctype/journal_entry/test_records.json
index bf98745..69781d0 100644
--- a/erpnext/accounts/doctype/journal_entry/test_records.json
+++ b/erpnext/accounts/doctype/journal_entry/test_records.json
@@ -3,7 +3,7 @@
"cheque_date": "2013-02-14",
"cheque_no": "33",
"company": "_Test Company",
- "doctype": "Journal Voucher",
+ "doctype": "Journal Entry",
"entries": [
{
"account": "_Test Receivable - _TC",
@@ -23,16 +23,16 @@
}
],
"fiscal_year": "_Test Fiscal Year 2013",
- "naming_series": "_T-Journal Voucher-",
+ "naming_series": "_T-Journal Entry-",
"posting_date": "2013-02-14",
"user_remark": "test",
- "voucher_type": "Bank Voucher"
+ "voucher_type": "Bank Entry"
},
{
"cheque_date": "2013-02-14",
"cheque_no": "33",
"company": "_Test Company",
- "doctype": "Journal Voucher",
+ "doctype": "Journal Entry",
"entries": [
{
"account": "_Test Payable - _TC",
@@ -52,16 +52,16 @@
}
],
"fiscal_year": "_Test Fiscal Year 2013",
- "naming_series": "_T-Journal Voucher-",
+ "naming_series": "_T-Journal Entry-",
"posting_date": "2013-02-14",
"user_remark": "test",
- "voucher_type": "Bank Voucher"
+ "voucher_type": "Bank Entry"
},
{
"cheque_date": "2013-02-14",
"cheque_no": "33",
"company": "_Test Company",
- "doctype": "Journal Voucher",
+ "doctype": "Journal Entry",
"entries": [
{
"account": "_Test Receivable - _TC",
@@ -82,9 +82,9 @@
}
],
"fiscal_year": "_Test Fiscal Year 2013",
- "naming_series": "_T-Journal Voucher-",
+ "naming_series": "_T-Journal Entry-",
"posting_date": "2013-02-14",
"user_remark": "test",
- "voucher_type": "Bank Voucher"
+ "voucher_type": "Bank Entry"
}
]
diff --git a/erpnext/accounts/doctype/journal_entry_account/README.md b/erpnext/accounts/doctype/journal_entry_account/README.md
index e6f9b43..09761cf 100644
--- a/erpnext/accounts/doctype/journal_entry_account/README.md
+++ b/erpnext/accounts/doctype/journal_entry_account/README.md
@@ -1 +1 @@
-Individual entry for parent Journal Voucher.
\ No newline at end of file
+Individual entry for parent Journal Entry.
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index 3a666d4..84a5643 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -145,7 +145,7 @@
"fieldname": "against_jv",
"fieldtype": "Link",
"in_filter": 1,
- "label": "Against Journal Voucher",
+ "label": "Against Journal Entry",
"no_copy": 1,
"oldfieldname": "against_jv",
"oldfieldtype": "Link",
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index 48e7579..bdd9c73 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -117,7 +117,7 @@
{
"fieldname": "sec_break2",
"fieldtype": "Section Break",
- "label": "Invoice/Journal Voucher Details",
+ "label": "Invoice/Journal Entry Details",
"permlevel": 0
},
{
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 8186bdf..f02a747 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -29,7 +29,7 @@
t1.name as voucher_no, t1.posting_date, t1.remark,
t2.name as voucher_detail_no, {dr_or_cr} as payment_amount, t2.is_advance
from
- `tabJournal Voucher` t1, `tabJournal Entry Account` t2
+ `tabJournal Entry` t1, `tabJournal Entry Account` t2
where
t1.name = t2.parent and t1.docstatus = 1 and t2.docstatus = 1
and t2.party_type = %(party_type)s and t2.party = %(party)s
@@ -58,7 +58,7 @@
self.set('payments', [])
for e in jv_entries:
ent = self.append('payments', {})
- ent.journal_voucher = e.get('voucher_no')
+ ent.journal_entry = e.get('voucher_no')
ent.posting_date = e.get('posting_date')
ent.amount = flt(e.get('payment_amount'))
ent.remark = e.get('remark')
@@ -142,7 +142,7 @@
for e in self.get('payments'):
if e.invoice_type and e.invoice_number and e.allocated_amount:
lst.append({
- 'voucher_no' : e.journal_voucher,
+ 'voucher_no' : e.journal_entry,
'voucher_detail_no' : e.voucher_detail_number,
'against_voucher_type' : e.invoice_type,
'against_voucher' : e.invoice_number,
diff --git a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
index 4e4ee1a..caa30c9 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
@@ -9,7 +9,7 @@
"fieldtype": "Data",
"in_list_view": 1,
"label": "Invoice Type",
- "options": "Sales Invoice\nPurchase Invoice\nJournal Voucher",
+ "options": "Sales Invoice\nPurchase Invoice\nJournal Entry",
"permlevel": 0,
"read_only": 1
},
diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index d8da463..92e136c 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -1,116 +1,116 @@
{
- "creation": "2014-07-09 16:13:35.452759",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
+ "creation": "2014-07-09 16:13:35.452759",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
"fields": [
{
- "fieldname": "journal_voucher",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Journal Voucher",
- "options": "Journal Voucher",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "journal_entry",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Journal Entry",
+ "options": "Journal Entry",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 0
- },
+ },
{
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date",
- "permlevel": 0,
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "Posting Date",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Amount",
- "permlevel": 0,
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Amount",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "is_advance",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Is Advance",
- "permlevel": 0,
+ "fieldname": "is_advance",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Is Advance",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "voucher_detail_number",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Voucher Detail Number",
- "permlevel": 0,
+ "fieldname": "voucher_detail_number",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Voucher Detail Number",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "col_break1",
- "fieldtype": "Column Break",
- "label": "Column Break",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "allocated_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Allocated amount",
- "permlevel": 0,
- "precision": "",
+ "fieldname": "allocated_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Allocated amount",
+ "permlevel": 0,
+ "precision": "",
"reqd": 1
- },
+ },
{
- "default": "Sales Invoice",
- "fieldname": "invoice_type",
- "fieldtype": "Select",
- "in_list_view": 0,
- "label": "Invoice Type",
- "options": "\nSales Invoice\nPurchase Invoice\nJournal Voucher",
- "permlevel": 0,
- "read_only": 0,
+ "default": "Sales Invoice",
+ "fieldname": "invoice_type",
+ "fieldtype": "Select",
+ "in_list_view": 0,
+ "label": "Invoice Type",
+ "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "invoice_number",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Invoice Number",
- "options": "",
- "permlevel": 0,
+ "fieldname": "invoice_number",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Invoice Number",
+ "options": "",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "sec_break1",
- "fieldtype": "Section Break",
- "label": "",
+ "fieldname": "sec_break1",
+ "fieldtype": "Section Break",
+ "label": "",
"permlevel": 0
- },
+ },
{
- "fieldname": "remark",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Remark",
- "permlevel": 0,
+ "fieldname": "remark",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Remark",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "col_break2",
- "fieldtype": "Column Break",
- "label": "Column Break",
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
"permlevel": 0
}
- ],
- "istable": 1,
- "modified": "2014-10-16 17:40:54.040194",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payment Reconciliation Payment",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
+ ],
+ "istable": 1,
+ "modified": "2014-12-25 16:26:48.345281",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Payment Reconciliation Payment",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
"sort_order": "DESC"
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.js b/erpnext/accounts/doctype/payment_tool/payment_tool.js
index b51be9c..78641de 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.js
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.js
@@ -6,7 +6,7 @@
// Help content
frappe.ui.form.on("Payment Tool", "onload", function(frm) {
frm.set_value("make_jv_help", '<i class="icon-hand-right"></i> '
- + __("Note: If payment is not made against any reference, make Journal Voucher manually."));
+ + __("Note: If payment is not made against any reference, make Journal Entry manually."));
frm.set_query("party_type", function() {
return {
@@ -26,7 +26,7 @@
frm.set_query("against_voucher_type", "against_vouchers", function() {
return {
- filters: {"name": ["in", ["Sales Invoice", "Purchase Invoice", "Journal Voucher", "Sales Order", "Purchase Order"]]}
+ filters: {"name": ["in", ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Sales Order", "Purchase Order"]]}
};
});
});
@@ -91,7 +91,7 @@
callback: function(r, rt) {
if(r.message) {
frm.fields_dict.get_outstanding_vouchers.$input.removeClass("btn-primary");
- frm.fields_dict.make_journal_voucher.$input.addClass("btn-primary");
+ frm.fields_dict.make_journal_entry.$input.addClass("btn-primary");
frappe.model.clear_table(frm.doc, "against_vouchers");
$.each(r.message, function(i, d) {
@@ -116,15 +116,15 @@
erpnext.payment_tool.validate_against_voucher = function(frm) {
$.each(frm.doc.against_vouchers || [], function(i, row) {
if(frm.doc.party_type=="Customer"
- && !in_list(["Sales Order", "Sales Invoice", "Journal Voucher"], row.against_voucher_type)) {
+ && !in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.against_voucher_type)) {
frappe.model.set_value(row.doctype, row.name, "against_voucher_type", "");
- frappe.throw(__("Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Voucher"))
+ frappe.throw(__("Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry"))
}
if(frm.doc.party_type=="Supplier"
- && !in_list(["Purchase Order", "Purchase Invoice", "Journal Voucher"], row.against_voucher_type)) {
+ && !in_list(["Purchase Order", "Purchase Invoice", "Journal Entry"], row.against_voucher_type)) {
frappe.model.set_value(row.doctype, row.name, "against_voucher_type", "");
- frappe.throw(__("Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Voucher"))
+ frappe.throw(__("Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry"))
}
});
@@ -176,15 +176,15 @@
}
-// Make Journal voucher
-frappe.ui.form.on("Payment Tool", "make_journal_voucher", function(frm) {
+// Make Journal Entry
+frappe.ui.form.on("Payment Tool", "make_journal_entry", function(frm) {
erpnext.payment_tool.check_mandatory_to_fetch(frm.doc);
return frappe.call({
- method: 'make_journal_voucher',
+ method: 'make_journal_entry',
doc: frm.doc,
callback: function(r) {
- frm.fields_dict.make_journal_voucher.$input.addClass("btn-primary");
+ frm.fields_dict.make_journal_entry.$input.addClass("btn-primary");
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.json b/erpnext/accounts/doctype/payment_tool/payment_tool.json
index ed713e4..b0ede0c 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.json
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.json
@@ -255,13 +255,13 @@
},
{
"allow_on_submit": 0,
- "fieldname": "make_journal_voucher",
+ "fieldname": "make_journal_entry",
"fieldtype": "Button",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Make Journal Voucher",
+ "label": "Make Journal Entry",
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
@@ -310,7 +310,7 @@
"is_submittable": 0,
"issingle": 1,
"istable": 0,
- "modified": "2014-12-24 16:33:57.341817",
+ "modified": "2014-12-25 16:28:30.612640",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Tool",
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.py b/erpnext/accounts/doctype/payment_tool/payment_tool.py
index c57ee25..873d059 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.py
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.py
@@ -9,18 +9,18 @@
import json
class PaymentTool(Document):
- def make_journal_voucher(self):
+ def make_journal_entry(self):
from erpnext.accounts.utils import get_balance_on
total_payment_amount = 0.00
invoice_voucher_type = {
'Sales Invoice': 'against_invoice',
'Purchase Invoice': 'against_voucher',
- 'Journal Voucher': 'against_jv',
+ 'Journal Entry': 'against_jv',
'Sales Order': 'against_sales_order',
'Purchase Order': 'against_purchase_order',
}
- jv = frappe.new_doc('Journal Voucher')
+ jv = frappe.new_doc('Journal Entry')
jv.voucher_type = 'Journal Entry'
jv.company = self.company
jv.cheque_no = self.reference_no
@@ -109,7 +109,7 @@
select_cond = "grand_total as total_amount, ifnull(grand_total, 0) - ifnull(advance_paid, 0) as outstanding_amount"
elif against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
select_cond = "grand_total as total_amount, outstanding_amount"
- elif against_voucher_type == "Journal Voucher":
+ elif against_voucher_type == "Journal Entry":
select_cond = "total_debit as total_amount"
details = frappe.db.sql("""select {0} from `tab{1}` where name = %s"""
diff --git a/erpnext/accounts/doctype/payment_tool/test_payment_tool.py b/erpnext/accounts/doctype/payment_tool/test_payment_tool.py
index 6555e66..0c11c65 100644
--- a/erpnext/accounts/doctype/payment_tool/test_payment_tool.py
+++ b/erpnext/accounts/doctype/payment_tool/test_payment_tool.py
@@ -8,8 +8,8 @@
test_dependencies = ["Item"]
class TestPaymentTool(unittest.TestCase):
- def test_make_journal_voucher(self):
- from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
+ def test_make_journal_entry(self):
+ from erpnext.accounts.doctype.journal_entry.test_journal_entry \
import test_records as jv_test_records
from erpnext.selling.doctype.sales_order.test_sales_order \
import test_records as so_test_records
@@ -84,7 +84,7 @@
#Create a dict containing properties and expected values
expected_outstanding = {
- "Journal Voucher" : [base_customer_jv.name, 400.00],
+ "Journal Entry" : [base_customer_jv.name, 400.00],
"Sales Invoice" : [si1.name, 161.80],
"Purchase Invoice" : [pi.name, 1512.30],
"Sales Order" : [so1.name, 600.00],
@@ -111,7 +111,7 @@
"party": "_Test Supplier 1",
"party_account": "_Test Payable - _TC"
})
- expected_outstanding["Journal Voucher"] = [base_supplier_jv.name, 400.00]
+ expected_outstanding["Journal Entry"] = [base_supplier_jv.name, 400.00]
self.make_voucher_for_party(args, expected_outstanding)
def create_voucher(self, test_record, args):
@@ -134,7 +134,7 @@
return jv
def make_voucher_for_party(self, args, expected_outstanding):
- #Make Journal Voucher for Party
+ #Make Journal Entry for Party
payment_tool_doc = frappe.new_doc("Payment Tool")
for k, v in args.items():
@@ -162,12 +162,12 @@
d1.payment_amount = 100.00
paytool.total_payment_amount = 300
- new_jv = paytool.make_journal_voucher()
+ new_jv = paytool.make_journal_entry()
#Create a list of expected values as [party account, payment against, against_jv, against_invoice,
#against_voucher, against_sales_order, against_purchase_order]
expected_values = [
- [paytool.party_account, paytool.party, 100.00, expected_outstanding.get("Journal Voucher")[0], None, None, None, None],
+ [paytool.party_account, paytool.party, 100.00, expected_outstanding.get("Journal Entry")[0], None, None, None, None],
[paytool.party_account, paytool.party, 100.00, None, expected_outstanding.get("Sales Invoice")[0], None, None, None],
[paytool.party_account, paytool.party, 100.00, None, None, expected_outstanding.get("Purchase Invoice")[0], None, None],
[paytool.party_account, paytool.party, 100.00, None, None, None, expected_outstanding.get("Sales Order")[0], None],
diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
index 146764d..aee6346 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import unittest
import frappe
-from erpnext.accounts.doctype.journal_voucher.test_journal_voucher import test_records as jv_records
+from erpnext.accounts.doctype.journal_entry.test_journal_entry import test_records as jv_records
class TestPeriodClosingVoucher(unittest.TestCase):
def test_closing_entry(self):
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 6f97794..8b36a60 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -27,8 +27,8 @@
// Show / Hide button
if(doc.docstatus==1 && doc.outstanding_amount > 0)
- this.frm.add_custom_button(__('Make Payment Entry'), this.make_bank_voucher,
- frappe.boot.doctype_icons["Journal Voucher"]);
+ this.frm.add_custom_button(__('Make Payment Entry'), this.make_bank_entry,
+ frappe.boot.doctype_icons["Journal Entry"]);
if(doc.docstatus==1) {
cur_frm.appframe.add_button(__('View Ledger'), function() {
@@ -127,9 +127,9 @@
if (doc.is_opening == 'Yes') unhide_field('aging_date');
}
-cur_frm.cscript.make_bank_voucher = function() {
+cur_frm.cscript.make_bank_entry = function() {
return frappe.call({
- method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_purchase_invoice",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_from_purchase_invoice",
args: {
"purchase_invoice": cur_frm.doc.name,
},
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 3ccace4..47b46ab 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -219,7 +219,7 @@
for d in self.get('advances'):
if flt(d.allocated_amount) > 0:
args = {
- 'voucher_no' : d.journal_voucher,
+ 'voucher_no' : d.journal_entry,
'voucher_detail_no' : d.jv_detail_no,
'against_voucher_type' : 'Purchase Invoice',
'against_voucher' : self.name,
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index a708873..e9aa373 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -199,7 +199,7 @@
self.assertEqual(tax.total, expected_values[i][2])
def test_purchase_invoice_with_advance(self):
- from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
+ from erpnext.accounts.doctype.journal_entry.test_journal_entry \
import test_records as jv_test_records
jv = frappe.copy_doc(jv_test_records[1])
@@ -208,7 +208,7 @@
pi = frappe.copy_doc(test_records[0])
pi.append("advances", {
- "journal_voucher": jv.name,
+ "journal_entry": jv.name,
"jv_detail_no": jv.get("entries")[0].name,
"advance_amount": 400,
"allocated_amount": 300,
diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
index 47e2d89..ec73ad4 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -1,88 +1,89 @@
{
- "creation": "2013-03-08 15:36:46.000000",
- "docstatus": 0,
- "doctype": "DocType",
+ "creation": "2013-03-08 15:36:46",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "journal_voucher",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Journal Voucher",
- "no_copy": 1,
- "oldfieldname": "journal_voucher",
- "oldfieldtype": "Link",
- "options": "Journal Voucher",
- "permlevel": 0,
- "print_width": "180px",
- "read_only": 1,
+ "fieldname": "journal_entry",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Journal Entry",
+ "no_copy": 1,
+ "oldfieldname": "journal_voucher",
+ "oldfieldtype": "Link",
+ "options": "Journal Entry",
+ "permlevel": 0,
+ "print_width": "180px",
+ "read_only": 1,
"width": "180px"
- },
+ },
{
- "fieldname": "jv_detail_no",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Journal Voucher Detail No",
- "no_copy": 1,
- "oldfieldname": "jv_detail_no",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "80px",
- "read_only": 1,
+ "fieldname": "jv_detail_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Journal Entry Detail No",
+ "no_copy": 1,
+ "oldfieldname": "jv_detail_no",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "80px",
+ "read_only": 1,
"width": "80px"
- },
+ },
{
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_width": "150px",
- "read_only": 1,
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Remarks",
+ "no_copy": 1,
+ "oldfieldname": "remarks",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "col_break1",
- "fieldtype": "Column Break",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "advance_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Advance Amount",
- "no_copy": 1,
- "oldfieldname": "advance_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_width": "100px",
- "read_only": 1,
+ "fieldname": "advance_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Advance Amount",
+ "no_copy": 1,
+ "oldfieldname": "advance_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_width": "100px",
+ "read_only": 1,
"width": "100px"
- },
+ },
{
- "fieldname": "allocated_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Allocated Amount",
- "no_copy": 1,
- "oldfieldname": "allocated_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_width": "100px",
+ "fieldname": "allocated_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Allocated Amount",
+ "no_copy": 1,
+ "oldfieldname": "allocated_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_width": "100px",
"width": "100px"
}
- ],
- "idx": 1,
- "istable": 1,
- "modified": "2014-02-03 12:38:24.000000",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Purchase Invoice Advance",
- "owner": "Administrator"
-}
\ No newline at end of file
+ ],
+ "idx": 1,
+ "istable": 1,
+ "modified": "2014-12-25 16:29:15.176476",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Purchase Invoice Advance",
+ "owner": "Administrator",
+ "permissions": []
+}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 82cbb2a..2887ccf 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -79,7 +79,7 @@
}
if(doc.outstanding_amount!=0) {
- cur_frm.appframe.add_primary_action(__('Make Payment Entry'), cur_frm.cscript.make_bank_voucher, "icon-money");
+ cur_frm.appframe.add_primary_action(__('Make Payment Entry'), cur_frm.cscript.make_bank_entry, "icon-money");
}
}
@@ -276,9 +276,9 @@
})
}
-cur_frm.cscript.make_bank_voucher = function() {
+cur_frm.cscript.make_bank_entry = function() {
return frappe.call({
- method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_sales_invoice",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_from_sales_invoice",
args: {
"sales_invoice": cur_frm.doc.name
},
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 0dbf345..546be6d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -222,7 +222,7 @@
for d in self.get('advances'):
if flt(d.allocated_amount) > 0:
args = {
- 'voucher_no' : d.journal_voucher,
+ 'voucher_no' : d.journal_entry,
'voucher_detail_no' : d.jv_detail_no,
'against_voucher_type' : 'Sales Invoice',
'against_voucher' : self.name,
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index cafdd3a..d0f4670 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -351,7 +351,7 @@
frappe.db.sql("""delete from `tabGL Entry`""")
w = self.make()
- from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
+ from erpnext.accounts.doctype.journal_entry.test_journal_entry \
import test_records as jv_test_records
jv = frappe.get_doc(frappe.copy_doc(jv_test_records[0]))
@@ -631,7 +631,7 @@
return dn
def test_sales_invoice_with_advance(self):
- from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
+ from erpnext.accounts.doctype.journal_entry.test_journal_entry \
import test_records as jv_test_records
jv = frappe.copy_doc(jv_test_records[0])
@@ -641,7 +641,7 @@
si = frappe.copy_doc(test_records[0])
si.append("advances", {
"doctype": "Sales Invoice Advance",
- "journal_voucher": jv.name,
+ "journal_entry": jv.name,
"jv_detail_no": jv.get("entries")[0].name,
"advance_amount": 400,
"allocated_amount": 300,
@@ -728,5 +728,5 @@
self.assertRaises(SerialNoStatusError, si.submit)
-test_dependencies = ["Journal Voucher", "Contact", "Address"]
+test_dependencies = ["Journal Entry", "Contact", "Address"]
test_records = frappe.get_test_records('Sales Invoice')
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
index 15bac1d..722ae12 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -1,88 +1,89 @@
{
- "creation": "2013-02-22 01:27:41.000000",
- "docstatus": 0,
- "doctype": "DocType",
+ "creation": "2013-02-22 01:27:41",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "journal_voucher",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Journal Voucher",
- "no_copy": 1,
- "oldfieldname": "journal_voucher",
- "oldfieldtype": "Link",
- "options": "Journal Voucher",
- "permlevel": 0,
- "print_width": "250px",
- "read_only": 1,
+ "fieldname": "journal_entry",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Journal Entry",
+ "no_copy": 1,
+ "oldfieldname": "journal_voucher",
+ "oldfieldtype": "Link",
+ "options": "Journal Entry",
+ "permlevel": 0,
+ "print_width": "250px",
+ "read_only": 1,
"width": "250px"
- },
+ },
{
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_width": "150px",
- "read_only": 1,
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Remarks",
+ "no_copy": 1,
+ "oldfieldname": "remarks",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "fieldname": "jv_detail_no",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Journal Voucher Detail No",
- "no_copy": 1,
- "oldfieldname": "jv_detail_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_width": "120px",
- "read_only": 1,
+ "fieldname": "jv_detail_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Journal Entry Detail No",
+ "no_copy": 1,
+ "oldfieldname": "jv_detail_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_width": "120px",
+ "read_only": 1,
"width": "120px"
- },
+ },
{
- "fieldname": "col_break1",
- "fieldtype": "Column Break",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "advance_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Advance amount",
- "no_copy": 1,
- "oldfieldname": "advance_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_width": "120px",
- "read_only": 1,
+ "fieldname": "advance_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Advance amount",
+ "no_copy": 1,
+ "oldfieldname": "advance_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_width": "120px",
+ "read_only": 1,
"width": "120px"
- },
+ },
{
- "fieldname": "allocated_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Allocated amount",
- "no_copy": 1,
- "oldfieldname": "allocated_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_width": "120px",
+ "fieldname": "allocated_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Allocated amount",
+ "no_copy": 1,
+ "oldfieldname": "allocated_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_width": "120px",
"width": "120px"
}
- ],
- "idx": 1,
- "istable": 1,
- "modified": "2014-02-03 12:38:53.000000",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Invoice Advance",
- "owner": "Administrator"
-}
\ No newline at end of file
+ ],
+ "idx": 1,
+ "istable": 1,
+ "modified": "2014-12-25 16:30:19.446500",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Invoice Advance",
+ "owner": "Administrator",
+ "permissions": []
+}
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 5b1bd28..9d4f86b 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -91,7 +91,7 @@
frappe.throw(_("Debit and Credit not equal for this voucher. Difference is {0}.").format(total_debit - total_credit))
def validate_account_for_auto_accounting_for_stock(gl_map):
- if gl_map[0].voucher_type=="Journal Voucher":
+ 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, '')!=''""")]
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 89a98d3..2b45a58 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,6 +1,6 @@
{
"creation": "2012-04-11 13:16:56",
- "doc_type": "Journal Voucher",
+ "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-sm-4\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-sm-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-sm-4\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-sm-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>",
diff --git a/erpnext/accounts/print_format/credit_note/credit_note.json b/erpnext/accounts/print_format/credit_note/credit_note.json
index 01258e3..27ed128 100644
--- a/erpnext/accounts/print_format/credit_note/credit_note.json
+++ b/erpnext/accounts/print_format/credit_note/credit_note.json
@@ -1,7 +1,7 @@
{
"creation": "2014-08-28 11:11:39.796473",
"disabled": 0,
- "doc_type": "Journal Voucher",
+ "doc_type": "Journal Entry",
"docstatus": 0,
"doctype": "Print Format",
"html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n\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\", _(\"Credit Note\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n {%- for label, value in (\n (_(\"Credit To\"), doc.pay_to_recd_from),\n (_(\"Date\"), frappe.utils.formatdate(doc.voucher_date)),\n (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n (_(\"Remarks\"), doc.remark)\n ) -%}\n\n <div class=\"row\">\n <div class=\"col-sm-3\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-sm-9\">{{ value }}</div>\n </div>\n\n {%- endfor -%}\n\n <hr>\n <br>\n <p class=\"strong\">\n {{ _(\"For\") }} {{ doc.company }},<br>\n <br>\n <br>\n <br>\n {{ _(\"Authorized Signatory\") }}\n </p>\n</div>\n\n\n",
@@ -11,7 +11,7 @@
"module": "Accounts",
"name": "Credit Note",
"owner": "Administrator",
- "parent": "Journal Voucher",
+ "parent": "Journal Entry",
"parentfield": "__print_formats",
"parenttype": "DocType",
"print_format_type": "Server",
diff --git a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
index 62cf6fe..a1b377a 100755
--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
@@ -1,6 +1,6 @@
{
"creation": "2012-05-01 12:46:31",
- "doc_type": "Journal Voucher",
+ "doc_type": "Journal Entry",
"docstatus": 0,
"doctype": "Print Format",
"html": "{%- 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 Receipt Note\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n {%- for label, value in (\n (_(\"Received On\"), frappe.utils.formatdate(doc.voucher_date)),\n (_(\"Received From\"), doc.pay_to_recd_from),\n (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n (_(\"Remarks\"), doc.remark)\n ) -%}\n <div class=\"row\">\n <div class=\"col-sm-3\"><label class=\"text-right\">{{ label }}</label></div>\n <div class=\"col-sm-9\">{{ value }}</div>\n </div>\n\n {%- endfor -%}\n\n <hr>\n <br>\n <p class=\"strong\">\n {{ _(\"For\") }} {{ doc.company }},<br>\n <br>\n <br>\n <br>\n {{ _(\"Authorized Signatory\") }}\n </p>\n</div>\n\n",
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json
index 5fd1609..4cd0e55 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json
@@ -10,7 +10,7 @@
"module": "Accounts",
"name": "Bank Clearance Summary",
"owner": "Administrator",
- "ref_doctype": "Journal Voucher",
+ "ref_doctype": "Journal Entry",
"report_name": "Bank Clearance Summary",
"report_type": "Script Report"
}
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
index 98dfdbb..aec4016 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -14,7 +14,7 @@
return columns, data
def get_columns():
- return [_("Journal Voucher") + ":Link/Journal Voucher:140", _("Account") + ":Link/Account:140",
+ return [_("Journal Entry") + ":Link/Journal Entry:140", _("Account") + ":Link/Account:140",
_("Posting Date") + ":Date:100", _("Clearance Date") + ":Date:110", _("Against Account") + ":Link/Account:200",
_("Debit") + ":Currency:120", _("Credit") + ":Currency:120"
]
@@ -35,7 +35,7 @@
conditions = get_conditions(filters)
entries = frappe.db.sql("""select jv.name, jvd.account, jv.posting_date,
jv.clearance_date, jvd.against_account, jvd.debit, jvd.credit
- from `tabJournal Entry Account` jvd, `tabJournal Voucher` jv
+ from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
where jvd.parent = jv.name and jv.docstatus=1 %s
order by jv.name DESC""" % conditions, filters, as_list=1)
return entries
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
index 9d67ba3..d749383 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
@@ -8,7 +8,7 @@
<thead>
<tr>
<th style="width: 15%">{%= __("Posting Date") %}</th>
- <th style="width: 15%">{%= __("Journal Voucher") %}</th>
+ <th style="width: 15%">{%= __("Journal Entry") %}</th>
<th style="width: 40%">{%= __("Reference") %}</th>
<th style="width: 15%; text-align: right;">{%= __("Debit") %}</th>
<th style="width: 15%; text-align: right;">{%= __("Credit") %}</th>
@@ -19,7 +19,7 @@
{% if (data[i][__("Posting Date")]) { %}
<tr>
<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
- <td>{%= data[i][__("Journal Voucher")] %}</td>
+ <td>{%= data[i][__("Journal Entry")] %}</td>
<td>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
{% if (data[i][__("Reference")]) { %}
<br>{%= __("Reference") %}: {%= data[i][__("Reference")] %}
@@ -38,7 +38,7 @@
<tr>
<td></td>
<td></td>
- <td>{%= data[i][__("Journal Voucher")] %}</td>
+ <td>{%= data[i][__("Journal Entry")] %}</td>
<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
</tr>
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
index fd0639b..fb2ee5d 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
@@ -11,7 +11,7 @@
"module": "Accounts",
"name": "Bank Reconciliation Statement",
"owner": "Administrator",
- "ref_doctype": "Journal Voucher",
+ "ref_doctype": "Journal Entry",
"report_name": "Bank Reconciliation Statement",
"report_type": "Script Report"
}
\ No newline at end of file
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 b55d9a4..d4c09a6 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -24,7 +24,7 @@
total_credit += flt(d[3])
amounts_not_reflected_in_system = frappe.db.sql("""select sum(ifnull(jvd.debit, 0) - ifnull(jvd.credit, 0))
- from `tabJournal Entry Account` jvd, `tabJournal Voucher` jv
+ from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
where jvd.parent = jv.name and jv.docstatus=1 and jvd.account=%s
and jv.posting_date > %s and jv.clearance_date <= %s and ifnull(jv.is_opening, 'No') = 'No'
""", (filters["account"], filters["report_date"], filters["report_date"]))
@@ -47,7 +47,7 @@
return columns, data
def get_columns():
- return [_("Posting Date") + ":Date:100", _("Journal Voucher") + ":Link/Journal Voucher:220",
+ return [_("Posting Date") + ":Date:100", _("Journal Entry") + ":Link/Journal Entry:220",
_("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
_("Against Account") + ":Link/Account:200", _("Reference") + "::100", _("Ref Date") + ":Date:110", _("Clearance Date") + ":Date:110"
]
@@ -57,7 +57,7 @@
jv.posting_date, jv.name, jvd.debit, jvd.credit,
jvd.against_account, jv.cheque_no, jv.cheque_date, jv.clearance_date
from
- `tabJournal Entry Account` jvd, `tabJournal Voucher` jv
+ `tabJournal Entry Account` jvd, `tabJournal Entry` jv
where jvd.parent = jv.name and jv.docstatus=1
and jvd.account = %(account)s and jv.posting_date <= %(report_date)s
and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json
index c668d19..3546114 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json
@@ -11,7 +11,7 @@
"module": "Accounts",
"name": "Payment Period Based On Invoice Date",
"owner": "Administrator",
- "ref_doctype": "Journal Voucher",
+ "ref_doctype": "Journal Entry",
"report_name": "Payment Period Based On Invoice Date",
"report_type": "Script Report"
}
\ No newline at end of file
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 434cb86..78f4261 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
@@ -37,7 +37,7 @@
return columns, data
def get_columns():
- return [_("Journal Voucher") + ":Link/Journal Voucher:140", _("Account") + ":Link/Account:140",
+ return [_("Journal Entry") + ":Link/Journal Entry:140", _("Account") + ":Link/Account:140",
_("Posting Date") + ":Date:100", _("Against Invoice") + ":Link/Purchase 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",
@@ -77,7 +77,7 @@
entries = frappe.db.sql("""select jv.name, jvd.account, 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 Voucher` jv
+ from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
where jvd.parent = jv.name and jv.docstatus=1 %s order by jv.name DESC""" %
(conditions), tuple(party_accounts), as_dict=1)
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index eb0c86d..617e109 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -136,7 +136,7 @@
check_if_jv_modified(d)
validate_allocated_amount(d)
against_fld = {
- 'Journal Voucher' : 'against_jv',
+ 'Journal Entry' : 'against_jv',
'Sales Invoice' : 'against_invoice',
'Purchase Invoice' : 'against_voucher'
}
@@ -144,7 +144,7 @@
d['against_fld'] = against_fld[d['against_voucher_type']]
# cancel JV
- jv_obj = frappe.get_doc('Journal Voucher', d['voucher_no'])
+ jv_obj = frappe.get_doc('Journal Entry', d['voucher_no'])
jv_obj.make_gl_entries(cancel=1, adv_adj=1)
@@ -152,7 +152,7 @@
update_against_doc(d, jv_obj)
# re-submit JV
- jv_obj = frappe.get_doc('Journal Voucher', d['voucher_no'])
+ jv_obj = frappe.get_doc('Journal Entry', d['voucher_no'])
jv_obj.make_gl_entries(cancel = 0, adv_adj =1)
@@ -163,7 +163,7 @@
check if jv is submitted
"""
ret = frappe.db.sql("""
- select t2.{dr_or_cr} from `tabJournal Voucher` t1, `tabJournal Entry Account` t2
+ select t2.{dr_or_cr} from `tabJournal Entry` t1, `tabJournal Entry Account` t2
where t1.name = t2.parent and t2.account = %(account)s
and t2.party_type = %(party_type)s and t2.party = %(party)s
and ifnull(t2.against_voucher, '')=''
@@ -225,7 +225,7 @@
and voucher_no != ifnull(against_voucher, '')""",
(now(), frappe.session.user, ref_type, ref_no))
- frappe.msgprint(_("Journal Vouchers {0} are un-linked".format("\n".join(linked_jv))))
+ frappe.msgprint(_("Journal Entries {0} are un-linked".format("\n".join(linked_jv))))
@frappe.whitelist()
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 245d46e..725147f 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -241,7 +241,7 @@
def make_purchase_invoice(source_name, target_doc=None):
def postprocess(source, target):
set_missing_values(source, target)
- #Get the advance paid Journal Vouchers in Purchase Invoice Advance
+ #Get the advance paid Journal Entries in Purchase Invoice Advance
target.get_advances()
def update_item(obj, target, source_parent):
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index 72cef3b..a2ff788 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -17,7 +17,7 @@
if (this.frm.doc.docstatus === 1) {
cur_frm.add_custom_button(__("Make Purchase Order"), this.make_purchase_order,
- frappe.boot.doctype_icons["Journal Voucher"]);
+ frappe.boot.doctype_icons["Journal Entry"]);
}
else if (this.frm.doc.docstatus===0) {
cur_frm.add_custom_button(__('From Material Request'),
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index c861a9e..0747ae1 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -8,7 +8,7 @@
"items": [
{
"type": "doctype",
- "name": "Journal Voucher",
+ "name": "Journal Entry",
"description": _("Accounting journal entries.")
},
{
@@ -234,7 +234,7 @@
"type": "report",
"name": "Bank Reconciliation Statement",
"is_query_report": True,
- "doctype": "Journal Voucher"
+ "doctype": "Journal Entry"
},
{
"type": "report",
@@ -264,13 +264,13 @@
"type": "report",
"name": "Bank Clearance Summary",
"is_query_report": True,
- "doctype": "Journal Voucher"
+ "doctype": "Journal Entry"
},
{
"type": "report",
"name": "Payment Period Based On Invoice Date",
"is_query_report": True,
- "doctype": "Journal Voucher"
+ "doctype": "Journal Entry"
},
{
"type": "report",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 276e36a..4c3057b 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -394,7 +394,7 @@
select
t1.name as jv_no, t1.remark, t2.{0} as amount, t2.name as jv_detail_no, `against_{1}` as against_order
from
- `tabJournal Voucher` t1, `tabJournal Entry Account` t2
+ `tabJournal Entry` t1, `tabJournal Entry Account` t2
where
t1.name = t2.parent and t2.account = %s
and t2.party_type=%s and t2.party=%s
@@ -413,7 +413,7 @@
for d in res:
self.append(parentfield, {
"doctype": child_doctype,
- "journal_voucher": d.jv_no,
+ "journal_entry": d.jv_no,
"jv_detail_no": d.jv_detail_no,
"remarks": d.remark,
"advance_amount": flt(d.amount),
@@ -438,12 +438,12 @@
for d in jv_against_order:
order_jv_map.setdefault(d.against_order, []).append(d.parent)
- advance_jv_against_si = [d.journal_voucher for d in self.get(advance_table_fieldname)]
+ advance_jv_against_si = [d.journal_entry for d in self.get(advance_table_fieldname)]
for order, jv_list in order_jv_map.items():
for jv in jv_list:
if not advance_jv_against_si or jv not in advance_jv_against_si:
- frappe.throw(_("Journal Voucher {0} is linked against Order {1}, hence it must be fetched as advance in Invoice as well.")
+ frappe.throw(_("Journal Entry {0} is linked against Order {1}, hence it must be fetched as advance in Invoice as well.")
.format(jv, order))
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 31d358a..03d7267 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -4,18 +4,18 @@
frappe.provide("erpnext.hr");
erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({
- make_bank_voucher: function() {
+ make_bank_entry: function() {
var me = this;
return frappe.call({
- method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
args: {
"company": cur_frm.doc.company,
- "voucher_type": "Bank Voucher"
+ "voucher_type": "Bank Entry"
},
callback: function(r) {
- var jv = frappe.model.make_new_doc_and_get_name('Journal Voucher');
- jv = locals['Journal Voucher'][jv];
- jv.voucher_type = 'Bank Voucher';
+ var jv = frappe.model.make_new_doc_and_get_name('Journal Entry');
+ jv = locals['Journal Entry'][jv];
+ jv.voucher_type = 'Bank Entry';
jv.company = cur_frm.doc.company;
jv.remark = 'Payment against Expense Claim: ' + cur_frm.doc.name;
jv.fiscal_year = cur_frm.doc.fiscal_year;
@@ -33,7 +33,7 @@
d1.balance = r.message.balance;
}
- loaddoc('Journal Voucher', jv.name);
+ loaddoc('Journal Entry', jv.name);
}
});
}
@@ -91,10 +91,10 @@
if(doc.docstatus==0 && doc.exp_approver==user && doc.approval_status=="Approved")
cur_frm.savesubmit();
- if(doc.docstatus==1 && frappe.model.can_create("Journal Voucher") &&
+ if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") &&
cint(doc.total_amount_reimbursed) < cint(doc.total_sanctioned_amount))
- cur_frm.add_custom_button(__("Make Bank Voucher"),
- cur_frm.cscript.make_bank_voucher, frappe.boot.doctype_icons["Journal Voucher"]);
+ cur_frm.add_custom_button(__("Make Bank Entry"),
+ cur_frm.cscript.make_bank_entry, frappe.boot.doctype_icons["Journal Entry"]);
}
}
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/salary_manager/salary_manager.js
index 57db375..4065690 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.js
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.js
@@ -29,7 +29,7 @@
}
}
-cur_frm.cscript.make_bank_voucher = function(doc,cdt,cdn){
+cur_frm.cscript.make_bank_entry = function(doc,cdt,cdn){
if(doc.company && doc.month && doc.fiscal_year){
cur_frm.cscript.make_jv(doc, cdt, cdn);
} else {
@@ -39,9 +39,9 @@
cur_frm.cscript.make_jv = function(doc, dt, dn) {
var call_back = function(r, rt){
- var jv = frappe.model.make_new_doc_and_get_name('Journal Voucher');
- jv = locals['Journal Voucher'][jv];
- jv.voucher_type = 'Bank Voucher';
+ var jv = frappe.model.make_new_doc_and_get_name('Journal Entry');
+ jv = locals['Journal Entry'][jv];
+ jv.voucher_type = 'Bank Entry';
jv.user_remark = __('Payment of salary for the month {0} and year {1}', [doc.month, doc.fiscal_year]);
jv.fiscal_year = doc.fiscal_year;
jv.company = doc.company;
@@ -56,7 +56,7 @@
var d2 = frappe.model.add_child(jv, 'Journal Entry Account', 'entries');
d2.debit = r.message['amount']
- loaddoc('Journal Voucher', jv.name);
+ loaddoc('Journal Entry', jv.name);
}
return $c_obj(doc, 'get_acc_details', '', call_back);
}
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.json b/erpnext/hr/doctype/salary_manager/salary_manager.json
index e430f3b..7b25ec2 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.json
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.json
@@ -1,163 +1,163 @@
{
- "allow_copy": 1,
- "allow_email": 1,
- "allow_print": 1,
- "creation": "2012-03-27 14:35:59",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
+ "allow_copy": 1,
+ "allow_email": 1,
+ "allow_print": 1,
+ "creation": "2012-03-27 14:35:59",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Other",
"fields": [
{
- "fieldname": "document_description",
- "fieldtype": "HTML",
- "label": "Document Description",
- "options": "<div class=\"alert alert-info\">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>",
+ "fieldname": "document_description",
+ "fieldtype": "HTML",
+ "label": "Document Description",
+ "options": "<div class=\"alert alert-info\">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break0",
- "fieldtype": "Section Break",
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "permlevel": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "branch",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Branch",
- "options": "Branch",
+ "fieldname": "branch",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Branch",
+ "options": "Branch",
"permlevel": 0
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Link",
- "label": "Department",
- "options": "Department",
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "label": "Department",
+ "options": "Department",
"permlevel": 0
- },
+ },
{
- "fieldname": "designation",
- "fieldtype": "Link",
- "label": "Designation",
- "options": "Designation",
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "label": "Designation",
+ "options": "Designation",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "label": "Fiscal Year",
- "options": "Fiscal Year",
- "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "label": "Fiscal Year",
+ "options": "Fiscal Year",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "month",
- "fieldtype": "Select",
- "label": "Month",
- "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
- "permlevel": 0,
+ "fieldname": "month",
+ "fieldtype": "Select",
+ "label": "Month",
+ "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
- "fieldname": "send_email",
- "fieldtype": "Check",
- "label": "Send Email",
+ "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
+ "fieldname": "send_email",
+ "fieldtype": "Check",
+ "label": "Send Email",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break1",
- "fieldtype": "Section Break",
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "Creates salary slip for above mentioned criteria.",
- "fieldname": "create_salary_slip",
- "fieldtype": "Button",
- "label": "Create Salary Slip",
+ "description": "Creates salary slip for above mentioned criteria.",
+ "fieldname": "create_salary_slip",
+ "fieldtype": "Button",
+ "label": "Create Salary Slip",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "25%"
- },
+ },
{
- "description": "Submit all salary slips for the above selected criteria",
- "fieldname": "submit_salary_slip",
- "fieldtype": "Button",
- "label": "Submit Salary Slip",
+ "description": "Submit all salary slips for the above selected criteria",
+ "fieldname": "submit_salary_slip",
+ "fieldtype": "Button",
+ "label": "Submit Salary Slip",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "25%"
- },
+ },
{
- "description": "Create Bank Voucher for the total salary paid for the above selected criteria",
- "fieldname": "make_bank_voucher",
- "fieldtype": "Button",
- "label": "Make Bank Voucher",
+ "description": "Create Bank Entry for the total salary paid for the above selected criteria",
+ "fieldname": "make_bank_entry",
+ "fieldtype": "Button",
+ "label": "Make Bank Entry",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break2",
- "fieldtype": "Section Break",
+ "fieldname": "section_break2",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "activity_log",
- "fieldtype": "HTML",
- "label": "Activity Log",
+ "fieldname": "activity_log",
+ "fieldtype": "HTML",
+ "label": "Activity Log",
"permlevel": 0
}
- ],
- "icon": "icon-cog",
- "idx": 1,
- "issingle": 1,
- "modified": "2014-06-04 06:46:39.437061",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Manager",
- "owner": "Administrator",
+ ],
+ "icon": "icon-cog",
+ "idx": 1,
+ "issingle": 1,
+ "modified": "2014-12-25 06:46:39.437061",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Manager",
+ "owner": "Administrator",
"permissions": [
{
- "create": 1,
- "permlevel": 0,
- "read": 1,
- "role": "HR Manager",
+ "create": 1,
+ "permlevel": 0,
+ "read": 1,
+ "role": "HR Manager",
"write": 1
}
- ],
- "sort_field": "modified",
+ ],
+ "sort_field": "modified",
"sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index fc4ecba..f7b1670 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -36,7 +36,7 @@
execute:frappe.delete_doc("DocType", "MIS Control")
execute:frappe.delete_doc("Page", "Financial Statements")
execute:frappe.delete_doc("DocType", "Stock Ledger")
-execute:frappe.db.sql("update `tabJournal Voucher` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
+execute:frappe.db.sql("update `tabJournal Entry` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
execute:frappe.delete_doc("DocType", "Grade")
execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''")
execute:frappe.delete_doc("Print Format", "SalesInvoice")
diff --git a/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py b/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py
index 7a19688..80e7437 100644
--- a/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py
+++ b/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py
@@ -17,7 +17,7 @@
'Delivery Note': 'DN-',
'Installation Note': 'IN-',
'Item': 'ITEM-',
- 'Journal Voucher': 'JV-',
+ 'Journal Entry': 'JV-',
'Lead': 'LEAD-',
'Opportunity': 'OPTY-',
'Packing Slip': 'PS-',
diff --git a/erpnext/patches/v4_0/set_naming_series_property_setter.py b/erpnext/patches/v4_0/set_naming_series_property_setter.py
index 7ebcc1e..d62d845 100644
--- a/erpnext/patches/v4_0/set_naming_series_property_setter.py
+++ b/erpnext/patches/v4_0/set_naming_series_property_setter.py
@@ -14,7 +14,7 @@
'Delivery Note': 'DN-',
'Installation Note': 'IN-',
'Item': 'ITEM-',
- 'Journal Voucher': 'JV-',
+ 'Journal Entry': 'JV-',
'Lead': 'LEAD-',
'Opportunity': 'OPTY-',
'Packing Slip': 'PS-',
diff --git a/erpnext/patches/v4_1/fix_jv_remarks.py b/erpnext/patches/v4_1/fix_jv_remarks.py
index 3b2f342..55e3800 100644
--- a/erpnext/patches/v4_1/fix_jv_remarks.py
+++ b/erpnext/patches/v4_1/fix_jv_remarks.py
@@ -6,15 +6,15 @@
def execute():
reference_date = guess_reference_date()
- for name in frappe.db.sql_list("""select name from `tabJournal Voucher`
+ for name in frappe.db.sql_list("""select name from `tabJournal Entry`
where date(creation)>=%s""", reference_date):
- jv = frappe.get_doc("Journal Voucher", name)
+ jv = frappe.get_doc("Journal Entry", name)
try:
jv.create_remarks()
except frappe.MandatoryError:
pass
else:
- frappe.db.set_value("Journal Voucher", jv.name, "remark", jv.remark)
+ frappe.db.set_value("Journal Entry", jv.name, "remark", jv.remark)
def guess_reference_date():
return (frappe.db.get_value("Patch Log", {"patch": "erpnext.patches.v4_0.validate_v3_patch"}, "creation")
diff --git a/erpnext/patches/v4_2/party_model.py b/erpnext/patches/v4_2/party_model.py
index 008dd36..d41ef62 100644
--- a/erpnext/patches/v4_2/party_model.py
+++ b/erpnext/patches/v4_2/party_model.py
@@ -7,7 +7,7 @@
def execute():
frappe.reload_doc("accounts", "doctype", "account")
frappe.reload_doc("setup", "doctype", "company")
- frappe.reload_doc("accounts", "doctype", "journal_voucher_detail")
+ frappe.reload_doc("accounts", "doctype", "journal_entry_account")
frappe.reload_doc("accounts", "doctype", "gl_entry")
receivable_payable_accounts = create_receivable_payable_account()
if receivable_payable_accounts:
diff --git a/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py b/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py
index 147dd64..afb5681 100644
--- a/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py
+++ b/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py
@@ -4,9 +4,9 @@
import frappe
def execute():
- for d in frappe.db.sql("""select name from `tabJournal Voucher` where docstatus < 2 """, as_dict=1):
+ for d in frappe.db.sql("""select name from `tabJournal Entry` where docstatus < 2 """, as_dict=1):
try:
- jv = frappe.get_doc('Journal Voucher', d.name)
+ jv = frappe.get_doc('Journal Entry', d.name)
jv.ignore_validate_update_after_submit = True
jv.set_print_format_fields()
jv.save()
diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py
index 9952d44..ccd4008 100644
--- a/erpnext/patches/v5_0/rename_table_fieldnames.py
+++ b/erpnext/patches/v5_0/rename_table_fieldnames.py
@@ -209,6 +209,15 @@
# "Workstation": [
# ["workstation_operation_hours", "working_hours"]
# ],
+ "Payment Reconciliation Payment": [
+ ["journal_voucher", "journal_entry"],
+ ],
+ "Purchase Invoice Advance": [
+ ["journal_voucher", "journal_entry"],
+ ],
+ "Sales Invoice Advance": [
+ ["journal_voucher", "journal_entry"],
+ ]
}
def execute():
@@ -228,3 +237,9 @@
["Budget Distribution", "Monthly Distribution"]]:
if "tab"+old_dt not in tables:
frappe.rename_doc("DocType", old_dt, new_dt, force=True)
+
+ # update voucher type
+ for old, new in [["Bank Voucher", "Bank Entry"], ["Cash Voucher", "Cash Entry"],
+ ["Credit Card Voucher", "Credit Card Entry"], ["Contra Voucher", "Contra Entry"],
+ ["Write Off Voucher", "Write Off Entry"], ["Excise Voucher", "Excise Entry"]]:
+ frappe.db.sql("update `tabJournal Entry` set voucher_type=%s where voucher_type=%s", (new, old))
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index e0254fa..0035f91 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -316,7 +316,7 @@
def make_sales_invoice(source_name, target_doc=None):
def postprocess(source, target):
set_missing_values(source, target)
- #Get the advance paid Journal Vouchers in Sales Invoice Advance
+ #Get the advance paid Journal Entries in Sales Invoice Advance
target.get_advances()
def set_missing_values(source, target):
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 8109e92..eccd1d2 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -15,7 +15,7 @@
"Opportunity": {"docstatus":0},
"Quotation": {"docstatus":0},
"Sales Order": {"docstatus":0},
- "Journal Voucher": {"docstatus":0},
+ "Journal Entry": {"docstatus":0},
"Sales Invoice": {"docstatus":0},
"Purchase Invoice": {"docstatus":0},
"Leave Application": {"status":"Open"},
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index b513442..8d7b474 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -69,14 +69,14 @@
this.show_general_ledger();
if(this.frm.doc.docstatus === 1 &&
- frappe.boot.user.can_create.indexOf("Journal Voucher")!==-1) {
+ frappe.boot.user.can_create.indexOf("Journal Entry")!==-1) {
if(this.frm.doc.purpose === "Sales Return") {
this.frm.add_custom_button(__("Make Credit Note"),
- function() { me.make_return_jv(); }, frappe.boot.doctype_icons["Journal Voucher"]);
+ function() { me.make_return_jv(); }, frappe.boot.doctype_icons["Journal Entry"]);
this.add_excise_button();
} else if(this.frm.doc.purpose === "Purchase Return") {
this.frm.add_custom_button(__("Make Debit Note"),
- function() { me.make_return_jv(); }, frappe.boot.doctype_icons["Journal Voucher"]);
+ function() { me.make_return_jv(); }, frappe.boot.doctype_icons["Journal Entry"]);
this.add_excise_button();
}
}
@@ -197,11 +197,11 @@
add_excise_button: function() {
if(frappe.boot.sysdefaults.country === "India")
this.frm.add_custom_button(__("Make Excise Invoice"), function() {
- var excise = frappe.model.make_new_doc_and_get_name('Journal Voucher');
- excise = locals['Journal Voucher'][excise];
- excise.voucher_type = 'Excise Voucher';
- loaddoc('Journal Voucher', excise.name);
- }, frappe.boot.doctype_icons["Journal Voucher"], "btn-default");
+ var excise = frappe.model.make_new_doc_and_get_name('Journal Entry');
+ excise = locals['Journal Entry'][excise];
+ excise.voucher_type = 'Excise Entry';
+ loaddoc('Journal Entry', excise.name);
+ }, frappe.boot.doctype_icons["Journal Entry"], "btn-default");
},
make_return_jv: function() {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 41c6f92..838fa39 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -822,7 +822,7 @@
result = make_return_jv_from_purchase_receipt(se, ref)
# create jv doc and fetch balance for each unique row item
- jv = frappe.new_doc("Journal Voucher")
+ jv = frappe.new_doc("Journal Entry")
jv.update({
"posting_date": se.posting_date,
"voucher_type": se.purpose == "Sales Return" and "Credit Note" or "Debit Note",
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 429c02e..133348e 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -151,8 +151,8 @@
Against Document No,ضد الوثيقة رقم
Against Expense Account,ضد حساب المصاريف
Against Income Account,ضد حساب الدخل
-Against Journal Voucher,ضد مجلة قسيمة
-Against Journal Voucher {0} does not have any unmatched {1} entry,ضد مجلة قسيمة {0} لا يملك أي لا مثيل له {1} دخول
+Against Journal Entry,ضد مجلة قسيمة
+Against Journal Entry {0} does not have any unmatched {1} entry,ضد مجلة قسيمة {0} لا يملك أي لا مثيل له {1} دخول
Against Purchase Invoice,ضد فاتورة الشراء
Against Sales Invoice,ضد فاتورة المبيعات
Against Sales Order,ضد ترتيب المبيعات
@@ -334,7 +334,7 @@
Bank Reconciliation,تسوية البنك
Bank Reconciliation Detail,تفاصيل تسوية البنك
Bank Reconciliation Statement,بيان تسوية البنك
-Bank Voucher,البنك قسيمة
+Bank Entry,البنك قسيمة
Bank/Cash Balance,بنك / النقد وما في حكمه
Banking,مصرفي
Barcode,الباركود
@@ -469,7 +469,7 @@
Case No. cannot be 0,القضية رقم لا يمكن أن يكون 0
Cash,نقد
Cash In Hand,نقد في الصندوق
-Cash Voucher,قسيمة نقدية
+Cash Entry,قسيمة نقدية
Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
Cash/Bank Account,النقد / البنك حساب
Casual Leave,عارضة اترك
@@ -593,7 +593,7 @@
Contacts,اتصالات
Content,محتوى
Content Type,نوع المحتوى
-Contra Voucher,كونترا قسيمة
+Contra Entry,كونترا قسيمة
Contract,عقد
Contract End Date,تاريخ نهاية العقد
Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
@@ -624,7 +624,7 @@
Country Name,الاسم الدولة
Country wise default Address Templates,قوالب بلد الحكمة العنوان الافتراضي
"Country, Timezone and Currency",البلد، المنطقة الزمنية و العملة
-Create Bank Voucher for the total salary paid for the above selected criteria,إنشاء بنك للقسيمة الراتب الإجمالي المدفوع للاختيار المعايير المذكورة أعلاه
+Create Bank Entry for the total salary paid for the above selected criteria,إنشاء بنك للقسيمة الراتب الإجمالي المدفوع للاختيار المعايير المذكورة أعلاه
Create Customer,خلق العملاء
Create Material Requests,إنشاء طلبات المواد
Create New,خلق جديد
@@ -646,7 +646,7 @@
Credit,ائتمان
Credit Amt,الائتمان AMT
Credit Card,بطاقة إئتمان
-Credit Card Voucher,بطاقة الائتمان قسيمة
+Credit Card Entry,بطاقة الائتمان قسيمة
Credit Controller,المراقب الائتمان
Credit Days,الائتمان أيام
Credit Limit,الحد الائتماني
@@ -978,7 +978,7 @@
Excise Duty Edu Cess 2,المكوس واجب ايدو سيس 2
Excise Duty SHE Cess 1,المكوس واجب SHE سيس 1
Excise Page Number,المكوس رقم الصفحة
-Excise Voucher,المكوس قسيمة
+Excise Entry,المكوس قسيمة
Execution,إعدام
Executive Search,البحث التنفيذي
Exemption Limit,إعفاء الحد
@@ -1326,7 +1326,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,الفترة من الفاتورة و الفاتورة ل فترة مواعيد إلزامية ل فاتورة المتكررة
Invoice Period To,فترة الفاتورة ل
Invoice Type,نوع الفاتورة
-Invoice/Journal Voucher Details,فاتورة / مجلة قسيمة تفاصيل
+Invoice/Journal Entry Details,فاتورة / مجلة قسيمة تفاصيل
Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
Is Active,نشط
Is Advance,هو المقدمة
@@ -1456,11 +1456,11 @@
Jobs Email Settings,إعدادات البريد الإلكتروني وظائف
Journal Entries,مجلة مقالات
Journal Entry,إدخال دفتر اليومية
-Journal Voucher,مجلة قسيمة
+Journal Entry,مجلة قسيمة
Journal Entry Account,مجلة قسيمة التفاصيل
Journal Entry Account No,مجلة التفاصيل قسيمة لا
-Journal Voucher {0} does not have account {1} or already matched,مجلة قسيمة {0} لا يملك حساب {1} أو بالفعل المتطابقة
-Journal Vouchers {0} are un-linked,مجلة قسائم {0} ترتبط الامم المتحدة و
+Journal Entry {0} does not have account {1} or already matched,مجلة قسيمة {0} لا يملك حساب {1} أو بالفعل المتطابقة
+Journal Entries {0} are un-linked,مجلة قسائم {0} ترتبط الامم المتحدة و
Keep a track of communication related to this enquiry which will help for future reference.,الحفاظ على مسار الاتصالات المتعلقة بهذا التحقيق والتي سوف تساعد للرجوع إليها مستقبلا.
Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
Key Performance Area,مفتاح الأداء المنطقة
@@ -1575,7 +1575,7 @@
Major/Optional Subjects,الرئيسية / اختياري الموضوعات
Make ,Make
Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
-Make Bank Voucher,جعل قسيمة البنك
+Make Bank Entry,جعل قسيمة البنك
Make Credit Note,جعل الائتمان ملاحظة
Make Debit Note,ملاحظة جعل الخصم
Make Delivery,جعل التسليم
@@ -3095,7 +3095,7 @@
Update Series Number,تحديث سلسلة رقم
Update Stock,تحديث الأسهم
Update bank payment dates with journals.,تحديث البنك دفع التواريخ مع المجلات.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',تاريخ التخليص تحديث إدخالات دفتر اليومية وضعت ' قسائم البنك
+Update clearance date of Journal Entries marked as 'Bank Entry',تاريخ التخليص تحديث إدخالات دفتر اليومية وضعت ' قسائم البنك
Updated,تحديث
Updated Birthday Reminders,تحديث ميلاد تذكير
Upload Attendance,تحميل الحضور
@@ -3233,7 +3233,7 @@
Write Off Based On,شطب بناء على
Write Off Cost Center,شطب مركز التكلفة
Write Off Outstanding Amount,شطب المبلغ المستحق
-Write Off Voucher,شطب قسيمة
+Write Off Entry,شطب قسيمة
Wrong Template: Unable to find head row.,قالب الخطأ: تعذر العثور على صف الرأس.
Year,عام
Year Closed,مغلق العام
@@ -3251,7 +3251,7 @@
You can enter the minimum quantity of this item to be ordered.,يمكنك إدخال كمية الحد الأدنى في هذا البند إلى أن يؤمر.
You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,لا يمكنك إدخال كل من التسليم ملاحظة لا و الفاتورة رقم المبيع الرجاء إدخال أي واحد .
-You can not enter current voucher in 'Against Journal Voucher' column,لا يمكنك إدخال قسيمة الحالي في ' ضد مجلة قسيمة ' العمود
+You can not enter current voucher in 'Against Journal Entry' column,لا يمكنك إدخال قسيمة الحالي في ' ضد مجلة قسيمة ' العمود
You can set Default Bank Account in Company master,يمكنك تعيين الافتراضي الحساب المصرفي الرئيسي في الشركة
You can start by selecting backup frequency and granting access for sync,يمكنك أن تبدأ من خلال تحديد تردد النسخ الاحتياطي و منح الوصول لمزامنة
You can submit this Stock Reconciliation.,يمكنك تقديم هذه الأسهم المصالحة .
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 9c38ba0..af96de7 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -166,8 +166,8 @@
Against Document No,Gegen Dokument Nr.
Against Expense Account,Gegen Aufwandskonto
Against Income Account,Gegen Einkommenskonto
-Against Journal Voucher,Gegen Journalgutschein
-Against Journal Voucher {0} does not have any unmatched {1} entry,Vor Blatt Gutschein {0} keine unerreichte {1} Eintrag haben
+Against Journal Entry,Gegen Journalgutschein
+Against Journal Entry {0} does not have any unmatched {1} entry,Vor Blatt Gutschein {0} keine unerreichte {1} Eintrag haben
Against Purchase Invoice,Gegen Einkaufsrechnung
Against Sales Invoice,Gegen Verkaufsrechnung
Against Sales Order,Vor Sales Order
@@ -357,7 +357,7 @@
Bank Reconciliation,Kontenabstimmung
Bank Reconciliation Detail,Kontenabstimmungsdetail
Bank Reconciliation Statement,Kontenabstimmungsauszug
-Bank Voucher,Bankbeleg
+Bank Entry,Bankbeleg
Bank/Cash Balance,Bank-/Bargeldsaldo
Banking,Bankwesen
Barcode,Barcode
@@ -495,7 +495,7 @@
Case No. cannot be 0,Fall Nr. kann nicht 0 sein
Cash,Bargeld
Cash In Hand,Bargeld in der Hand
-Cash Voucher,Kassenbeleg
+Cash Entry,Kassenbeleg
Cash or Bank Account is mandatory for making payment entry,Barzahlung oder Bankkonto ist für die Zahlung Eintrag
Cash/Bank Account,Kassen-/Bankkonto
Casual Leave,Lässige Leave
@@ -624,7 +624,7 @@
Contacts,Impressum
Content,Inhalt
Content Type,Inhaltstyp
-Contra Voucher,Gegen Gutschein
+Contra Entry,Gegen Gutschein
Contract,Vertrag
Contract End Date,Vertragsende
Contract End Date must be greater than Date of Joining,Vertragsende muss größer sein als Datum für Füge sein
@@ -656,7 +656,7 @@
Country wise default Address Templates,Land weise Standardadressvorlagen
"Country, Timezone and Currency","Land , Zeitzone und Währung"
Cr,Cr
-Create Bank Voucher for the total salary paid for the above selected criteria,Bankgutschein für das Gesamtgehalt nach den oben ausgewählten Kriterien erstellen
+Create Bank Entry for the total salary paid for the above selected criteria,Bankgutschein für das Gesamtgehalt nach den oben ausgewählten Kriterien erstellen
Create Customer,Neues Kunden
Create Material Requests,Materialanfragen erstellen
Create New,Neu erstellen
@@ -679,7 +679,7 @@
Credit,Guthaben
Credit Amt,Guthabenbetrag
Credit Card,Kreditkarte
-Credit Card Voucher,Kreditkarten-Gutschein
+Credit Card Entry,Kreditkarten-Gutschein
Credit Controller,Kredit-Controller
Credit Days,Kredittage
Credit Limit,Kreditlimit
@@ -1021,7 +1021,7 @@
Excise Duty Edu Cess 2,Verbrauchsteuer Edu Cess 2
Excise Duty SHE Cess 1,Verbrauchsteuer SHE Cess 1
Excise Page Number,Seitenzahl ausschneiden
-Excise Voucher,Gutschein ausschneiden
+Excise Entry,Gutschein ausschneiden
Execution,Ausführung
Executive Search,Executive Search
Exhibition,Ausstellung
@@ -1376,7 +1376,7 @@
Invoice No,Rechnungs-Nr.
Invoice Number,Rechnungsnummer
Invoice Type,Rechnungstyp
-Invoice/Journal Voucher Details,Rechnung / Journal Gutschein-Details
+Invoice/Journal Entry Details,Rechnung / Journal Gutschein-Details
Invoiced Amount (Exculsive Tax),Rechnungsbetrag ( Exculsive MwSt.)
Is Active,Ist aktiv
Is Advance,Ist Voraus
@@ -1512,11 +1512,11 @@
Jobs Email Settings,Stellen-E-Mail-Einstellungen
Journal Entries,Journaleinträge
Journal Entry,Journaleintrag
-Journal Voucher,Journal
+Journal Entry,Journal
Journal Entry Account,Detailansicht Beleg
Journal Entry Account No,Journalnummer
-Journal Voucher {0} does not have account {1} or already matched,Blatt Gutschein {0} ist nicht Konto haben {1} oder bereits abgestimmt
-Journal Vouchers {0} are un-linked,Blatt Gutscheine {0} sind un -linked
+Journal Entry {0} does not have account {1} or already matched,Blatt Gutschein {0} ist nicht Konto haben {1} oder bereits abgestimmt
+Journal Entries {0} are un-linked,Blatt Gutscheine {0} sind un -linked
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
Keep a track of communication related to this enquiry which will help for future reference.,Kommunikation bezüglich dieser Anfrage für zukünftige Zwecke aufbewahren.
Keep it web friendly 900px (w) by 100px (h),"Bitte passende Größe für Webdarstellung wählen:
@@ -1638,7 +1638,7 @@
Major/Optional Subjects,Wichtiger/optionaler Betreff
Make ,Make
Make Accounting Entry For Every Stock Movement,Machen Accounting Eintrag für jede Lagerbewegung
-Make Bank Voucher,Bankbeleg erstellen
+Make Bank Entry,Bankbeleg erstellen
Make Credit Note,Gutschrift erstellen
Make Debit Note,Lastschrift erstellen
Make Delivery,Lieferung erstellen
@@ -3222,7 +3222,7 @@
Update Stock,Lagerbestand aktualisieren
Update additional costs to calculate landed cost of items,Aktualisieren Sie Zusatzkosten um die Einstandskosten des Artikels zu kalkulieren
Update bank payment dates with journals.,Aktualisierung der Konten mit Hilfe der Journaleinträge
-Update clearance date of Journal Entries marked as 'Bank Vouchers',"Update- Clearance Datum der Journaleinträge als ""Bank Gutscheine 'gekennzeichnet"
+Update clearance date of Journal Entries marked as 'Bank Entry',"Update- Clearance Datum der Journaleinträge als ""Bank Gutscheine 'gekennzeichnet"
Updated,Aktualisiert
Updated Birthday Reminders,Geburtstagserinnerungen aktualisiert
Upload Attendance,Teilnahme hochladen
@@ -3362,7 +3362,7 @@
Write Off Based On,Abschreiben basiert auf
Write Off Cost Center,"Abschreiben, Kostenstelle"
Write Off Outstanding Amount,"Abschreiben, ausstehender Betrag"
-Write Off Voucher,"Abschreiben, Gutschein"
+Write Off Entry,"Abschreiben, Gutschein"
Wrong Template: Unable to find head row.,Falsche Vorlage: Kopfzeile nicht gefunden
Year,Jahr
Year Closed,Jahr geschlossen
@@ -3380,7 +3380,7 @@
You can enter the minimum quantity of this item to be ordered.,"Sie können die Mindestmenge des Artikels eingeben, der bestellt werden soll."
You can not change rate if BOM mentioned agianst any item,"Sie können Rate nicht ändern, wenn BOM agianst jeden Artikel erwähnt"
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Sie können nicht sowohl Lieferschein Nein und Sales Invoice Nr. Bitte geben Sie eine beliebige .
-You can not enter current voucher in 'Against Journal Voucher' column,"Sie können keine aktuellen Gutschein in ""Gegen Blatt Gutschein -Spalte"
+You can not enter current voucher in 'Against Journal Entry' column,"Sie können keine aktuellen Gutschein in ""Gegen Blatt Gutschein -Spalte"
You can set Default Bank Account in Company master,Sie können Standard- Bank-Konto in Firmen Master eingestellt
You can start by selecting backup frequency and granting access for sync,Sie können durch Auswahl Backup- Frequenz und den Zugang für die Gewährung Sync starten
You can submit this Stock Reconciliation.,Sie können diese Vektor Versöhnung vorzulegen.
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index d43706c..d17749a 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -152,8 +152,8 @@
Against Document No,Ενάντια έγγραφο αριθ.
Against Expense Account,Ενάντια Λογαριασμός Εξόδων
Against Income Account,Έναντι του λογαριασμού εισοδήματος
-Against Journal Voucher,Ενάντια Voucher Εφημερίδα
-Against Journal Voucher {0} does not have any unmatched {1} entry,Ενάντια Εφημερίδα Voucher {0} δεν έχει ταίρι {1} εισόδου
+Against Journal Entry,Ενάντια Voucher Εφημερίδα
+Against Journal Entry {0} does not have any unmatched {1} entry,Ενάντια Εφημερίδα Voucher {0} δεν έχει ταίρι {1} εισόδου
Against Purchase Invoice,Έναντι τιμολογίου αγοράς
Against Sales Invoice,Ενάντια Πωλήσεις Τιμολόγιο
Against Sales Order,Ενάντια Πωλήσεις Τάξης
@@ -335,7 +335,7 @@
Bank Reconciliation,Τράπεζα Συμφιλίωση
Bank Reconciliation Detail,Τράπεζα Λεπτομέρεια Συμφιλίωση
Bank Reconciliation Statement,Τράπεζα Δήλωση Συμφιλίωση
-Bank Voucher,Voucher Bank
+Bank Entry,Voucher Bank
Bank/Cash Balance,Τράπεζα / Cash Balance
Banking,Banking
Barcode,Barcode
@@ -470,7 +470,7 @@
Case No. cannot be 0,Υπόθεση αριθ. δεν μπορεί να είναι 0
Cash,Μετρητά
Cash In Hand,Μετρητά στο χέρι
-Cash Voucher,Ταμειακό παραστατικό
+Cash Entry,Ταμειακό παραστατικό
Cash or Bank Account is mandatory for making payment entry,Μετρητά ή τραπεζικός λογαριασμός είναι υποχρεωτική για την κατασκευή εισόδου πληρωμής
Cash/Bank Account,Μετρητά / Τραπεζικό Λογαριασμό
Casual Leave,Casual Αφήστε
@@ -594,7 +594,7 @@
Contacts,Επαφές
Content,Περιεχόμενο
Content Type,Τύπος περιεχομένου
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,σύμβαση
Contract End Date,Σύμβαση Ημερομηνία Λήξης
Contract End Date must be greater than Date of Joining,"Ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι Ημερομηνία Ενώνουμε"
@@ -625,7 +625,7 @@
Country Name,Όνομα Χώρα
Country wise default Address Templates,Χώρα σοφός default Διεύθυνση Πρότυπα
"Country, Timezone and Currency","Χώρα , Χρονική ζώνη και Συνάλλαγμα"
-Create Bank Voucher for the total salary paid for the above selected criteria,Δημιουργία Voucher Τράπεζας για το σύνολο του μισθού που καταβάλλεται για τις επιλεγμένες παραπάνω κριτήρια
+Create Bank Entry for the total salary paid for the above selected criteria,Δημιουργία Voucher Τράπεζας για το σύνολο του μισθού που καταβάλλεται για τις επιλεγμένες παραπάνω κριτήρια
Create Customer,Δημιουργία Πελάτη
Create Material Requests,Δημιουργία Αιτήσεις Υλικό
Create New,Δημιουργία νέου
@@ -647,7 +647,7 @@
Credit,Πίστωση
Credit Amt,Credit Amt
Credit Card,Πιστωτική Κάρτα
-Credit Card Voucher,Πιστωτική Κάρτα Voucher
+Credit Card Entry,Πιστωτική Κάρτα Voucher
Credit Controller,Credit Controller
Credit Days,Ημέρες Credit
Credit Limit,Όριο Πίστωσης
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Excise Duty Edu Cess 2
Excise Duty SHE Cess 1,Excise Duty SHE Cess 1
Excise Page Number,Excise Αριθμός σελίδας
-Excise Voucher,Excise Voucher
+Excise Entry,Excise Entry
Execution,εκτέλεση
Executive Search,Executive Search
Exemption Limit,Όριο απαλλαγής
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Τιμολόγιο Περίοδος Από και Τιμολόγιο Περίοδος Προς ημερομηνίες υποχρεωτική για επαναλαμβανόμενες τιμολόγιο
Invoice Period To,Τιμολόγιο Περίοδος να
Invoice Type,Τιμολόγιο Τύπος
-Invoice/Journal Voucher Details,Τιμολόγιο / Εφημερίδα Voucher Λεπτομέρειες
+Invoice/Journal Entry Details,Τιμολόγιο / Εφημερίδα Voucher Λεπτομέρειες
Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης ( exculsive ΦΠΑ)
Is Active,Είναι ενεργός
Is Advance,Είναι Advance
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Εργασία Ρυθμίσεις Email
Journal Entries,Εφημερίδα Καταχωρήσεις
Journal Entry,Journal Entry
-Journal Voucher,Εφημερίδα Voucher
+Journal Entry,Εφημερίδα Voucher
Journal Entry Account,Εφημερίδα Λεπτομέρεια Voucher
Journal Entry Account No,Εφημερίδα Λεπτομέρεια φύλλου αριθ.
-Journal Voucher {0} does not have account {1} or already matched,Εφημερίδα Voucher {0} δεν έχει λογαριασμό {1} ή έχουν ήδη συμφωνημένα
-Journal Vouchers {0} are un-linked,Εφημερίδα Κουπόνια {0} είναι μη συνδεδεμένο
+Journal Entry {0} does not have account {1} or already matched,Εφημερίδα Voucher {0} δεν έχει λογαριασμό {1} ή έχουν ήδη συμφωνημένα
+Journal Entries {0} are un-linked,Εφημερίδα Κουπόνια {0} είναι μη συνδεδεμένο
Keep a track of communication related to this enquiry which will help for future reference.,Κρατήστε ένα κομμάτι της επικοινωνίας που σχετίζονται με την έρευνα αυτή που θα βοηθήσει για μελλοντική αναφορά.
Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό web 900px ( w ) από 100px ( h )
Key Performance Area,Βασικά Επιδόσεων
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Σημαντικές / προαιρετικά μαθήματα
Make ,Make
Make Accounting Entry For Every Stock Movement,Κάντε Λογιστική καταχώρηση για κάθε Κίνημα Χρηματιστήριο
-Make Bank Voucher,Κάντε Voucher Bank
+Make Bank Entry,Κάντε Voucher Bank
Make Credit Note,Κάντε Πιστωτικό Σημείωμα
Make Debit Note,Κάντε χρεωστικό σημείωμα
Make Delivery,Κάντε Παράδοση
@@ -3096,7 +3096,7 @@
Update Series Number,Ενημέρωση Αριθμός Σειράς
Update Stock,Ενημέρωση Χρηματιστήριο
Update bank payment dates with journals.,Ενημέρωση τράπεζα ημερομηνίες πληρωμής με περιοδικά.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Ενημέρωση ημερομηνία εκκαθάρισης της Εφημερίδας των εγγραφών που χαρακτηρίζονται ως « Τράπεζα Κουπόνια »
+Update clearance date of Journal Entries marked as 'Bank Entry',Ενημέρωση ημερομηνία εκκαθάρισης της Εφημερίδας των εγγραφών που χαρακτηρίζονται ως « Τράπεζα Κουπόνια »
Updated,Ενημέρωση
Updated Birthday Reminders,Ενημερώθηκε Υπενθυμίσεις γενεθλίων
Upload Attendance,Ανεβάστε Συμμετοχή
@@ -3234,7 +3234,7 @@
Write Off Based On,Γράψτε Off βάση την
Write Off Cost Center,Γράψτε Off Κέντρο Κόστους
Write Off Outstanding Amount,Γράψτε Off οφειλόμενο ποσό
-Write Off Voucher,Γράψτε Off Voucher
+Write Off Entry,Γράψτε Off Voucher
Wrong Template: Unable to find head row.,Λάθος Πρότυπο: Ανίκανος να βρει γραμμή κεφάλι.
Year,Έτος
Year Closed,Έτους που έκλεισε
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Μπορείτε να εισάγετε την ελάχιστη ποσότητα αυτού του στοιχείου που πρέπει να καταδικαστεί.
You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε ρυθμό , αν BOM αναφέρεται agianst οποιοδήποτε στοιχείο"
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Δεν μπορείτε να εισάγετε δύο Παράδοση Σημείωση Όχι και Τιμολόγιο Πώλησης Νο Παρακαλώ εισάγετε κάθε μία .
-You can not enter current voucher in 'Against Journal Voucher' column,Δεν μπορείτε να εισάγετε την τρέχουσα κουπόνι σε « Ενάντια Εφημερίδα Voucher της στήλης
+You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα κουπόνι σε « Ενάντια Εφημερίδα Voucher της στήλης
You can set Default Bank Account in Company master,Μπορείτε να ρυθμίσετε Προεπιλογή Τραπεζικού Λογαριασμού στην Εταιρεία πλοίαρχος
You can start by selecting backup frequency and granting access for sync,Μπορείτε να ξεκινήσετε επιλέγοντας τη συχνότητα δημιουργίας αντιγράφων ασφαλείας και την παροχή πρόσβασης για συγχρονισμό
You can submit this Stock Reconciliation.,Μπορείτε να υποβάλετε αυτό το Χρηματιστήριο Συμφιλίωση .
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 3086b29..67c8975 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -152,8 +152,8 @@
Against Document No,Contra el Documento No
Against Expense Account,Contra la Cuenta de Gastos
Against Income Account,Contra la Cuenta de Utilidad
-Against Journal Voucher,Contra Comprobante de Diario
-Against Journal Voucher {0} does not have any unmatched {1} entry,Contra Comprobante de Diario {0} aún no tiene {1} entrada asignada
+Against Journal Entry,Contra Comprobante de Diario
+Against Journal Entry {0} does not have any unmatched {1} entry,Contra Comprobante de Diario {0} aún no tiene {1} entrada asignada
Against Purchase Invoice,Contra la Factura de Compra
Against Sales Invoice,Contra la Factura de Venta
Against Sales Order,Contra la Orden de Venta
@@ -335,7 +335,7 @@
Bank Reconciliation,Conciliación Bancaria
Bank Reconciliation Detail,Detalle de Conciliación Bancaria
Bank Reconciliation Statement,Declaración de Conciliación Bancaria
-Bank Voucher,Banco de Vales
+Bank Entry,Banco de Vales
Bank/Cash Balance,Banco / Balance de Caja
Banking,Banca
Barcode,Código de Barras
@@ -470,7 +470,7 @@
Case No. cannot be 0,Nº de Caso no puede ser 0
Cash,Efectivo
Cash In Hand,Efectivo Disponible
-Cash Voucher,Comprobante de Efectivo
+Cash Entry,Comprobante de Efectivo
Cash or Bank Account is mandatory for making payment entry,Cuenta de Efectivo o Cuenta Bancaria es obligatoria para hacer una entrada de pago
Cash/Bank Account,Cuenta de Caja / Banco
Casual Leave,Permiso Temporal
@@ -597,7 +597,7 @@
Contacts,Contactos
Content,Contenido
Content Type,Tipo de Contenido
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,Contrato
Contract End Date,Fecha Fin de Contrato
Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
@@ -628,7 +628,7 @@
Country Name,Nombre del país
Country wise default Address Templates,Plantillas País sabia dirección predeterminada
"Country, Timezone and Currency","País , Zona Horaria y Moneda"
-Create Bank Voucher for the total salary paid for the above selected criteria,Cree Banco Vale para el salario total pagado por los criterios seleccionados anteriormente
+Create Bank Entry for the total salary paid for the above selected criteria,Cree Banco Vale para el salario total pagado por los criterios seleccionados anteriormente
Create Customer,Crear cliente
Create Material Requests,Crear Solicitudes de Material
Create New,Crear Nuevo
@@ -650,7 +650,7 @@
Credit,Crédito
Credit Amt,crédito Amt
Credit Card,Tarjeta de Crédito
-Credit Card Voucher,Vale la tarjeta de crédito
+Credit Card Entry,Vale la tarjeta de crédito
Credit Controller,Credit Controller
Credit Days,Días de Crédito
Credit Limit,Límite de Crédito
@@ -982,7 +982,7 @@
Excise Duty Edu Cess 2,Impuestos Especiales Edu Cess 2
Excise Duty SHE Cess 1,Impuestos Especiales SHE Cess 1
Excise Page Number,Número Impuestos Especiales Página
-Excise Voucher,vale de Impuestos Especiales
+Excise Entry,vale de Impuestos Especiales
Execution,ejecución
Executive Search,Búsqueda de Ejecutivos
Exemption Limit,Límite de Exención
@@ -1330,7 +1330,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Factura Periodo Del Período y Factura Para las fechas obligatorias para la factura recurrente
Invoice Period To,Período Factura Para
Invoice Type,Tipo de Factura
-Invoice/Journal Voucher Details,Detalles de Factura / Comprobante de Diario
+Invoice/Journal Entry Details,Detalles de Factura / Comprobante de Diario
Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
Is Active,Está Activo
Is Advance,Es Avance
@@ -1460,11 +1460,11 @@
Jobs Email Settings,Trabajos Email
Journal Entries,entradas de diario
Journal Entry,Entrada de diario
-Journal Voucher,Comprobante de Diario
+Journal Entry,Comprobante de Diario
Journal Entry Account,Detalle del Asiento de Diario
Journal Entry Account No,Detalle del Asiento de Diario No
-Journal Voucher {0} does not have account {1} or already matched,Comprobante de Diario {0} no tiene cuenta {1} o ya emparejado
-Journal Vouchers {0} are un-linked,Asientos de Diario {0} no están vinculados.
+Journal Entry {0} does not have account {1} or already matched,Comprobante de Diario {0} no tiene cuenta {1} o ya emparejado
+Journal Entries {0} are un-linked,Asientos de Diario {0} no están vinculados.
Keep a track of communication related to this enquiry which will help for future reference.,Mantenga un registro de la comunicación en relación con esta consulta que ayudará para futuras consultas.
Keep it web friendly 900px (w) by 100px (h),Manténgalo adecuado para la web 900px ( w ) por 100px ( h )
Key Performance Area,Área Clave de Rendimiento
@@ -1579,7 +1579,7 @@
Major/Optional Subjects,Principales / Asignaturas optativas
Make ,Hacer
Make Accounting Entry For Every Stock Movement,Hacer asiento contable para cada movimiento de acciones
-Make Bank Voucher,Hacer Banco Voucher
+Make Bank Entry,Hacer Banco Voucher
Make Credit Note,Hacer Nota de Crédito
Make Debit Note,Haga Nota de Débito
Make Delivery,Hacer Entrega
@@ -3101,7 +3101,7 @@
Update Series Number,Actualización de los números de serie
Update Stock,Actualización de Stock
Update bank payment dates with journals.,Actualización de las fechas de pago del banco con las revistas .
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Fecha de despacho de actualización de entradas de diario marcado como ' Banco vales '
+Update clearance date of Journal Entries marked as 'Bank Entry',Fecha de despacho de actualización de entradas de diario marcado como ' Banco vales '
Updated,actualizado
Updated Birthday Reminders,Actualizado Birthday Reminders
Upload Attendance,Subir Asistencia
@@ -3239,7 +3239,7 @@
Write Off Based On,Escribe apagado basado en
Write Off Cost Center,Escribe Off Center Costo
Write Off Outstanding Amount,Escribe Off Monto Pendiente
-Write Off Voucher,Escribe Off Voucher
+Write Off Entry,Escribe Off Voucher
Wrong Template: Unable to find head row.,Plantilla incorrecto : no se puede encontrar la fila cabeza.
Year,Año
Year Closed,Año Cerrado
@@ -3257,7 +3257,7 @@
You can enter the minimum quantity of this item to be ordered.,Puede introducir la cantidad mínima que se puede pedir de este artículo.
You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si BOM mencionó agianst cualquier artículo
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,No se puede introducir tanto Entrega Nota No y Factura No. Por favor ingrese cualquiera .
-You can not enter current voucher in 'Against Journal Voucher' column,Usted no puede entrar bono actual en ' Contra Diario Vale ' columna
+You can not enter current voucher in 'Against Journal Entry' column,Usted no puede entrar bono actual en ' Contra Diario Vale ' columna
You can set Default Bank Account in Company master,Puede configurar cuenta bancaria por defecto en el maestro de la empresa
You can start by selecting backup frequency and granting access for sync,Puedes empezar por seleccionar la frecuencia de copia de seguridad y la concesión de acceso para la sincronización
You can submit this Stock Reconciliation.,Puede enviar este Stock Reconciliación.
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 804e5ce..58bc947 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -153,8 +153,8 @@
Against Document No,Contre le document n °
Against Expense Account,Contre compte de dépenses
Against Income Account,Contre compte le revenu
-Against Journal Voucher,Contre Bon Journal
-Against Journal Voucher {0} does not have any unmatched {1} entry,Contre Journal Bon {0} n'a pas encore inégalée {1} entrée
+Against Journal Entry,Contre Bon Journal
+Against Journal Entry {0} does not have any unmatched {1} entry,Contre Journal Bon {0} n'a pas encore inégalée {1} entrée
Against Purchase Invoice,Contre facture d'achat
Against Sales Invoice,Contre facture de vente
Against Sales Order,Contre Commande
@@ -336,7 +336,7 @@
Bank Reconciliation,Rapprochement bancaire
Bank Reconciliation Detail,Détail du rapprochement bancaire
Bank Reconciliation Statement,Énoncé de rapprochement bancaire
-Bank Voucher,Coupon de la banque
+Bank Entry,Coupon de la banque
Bank/Cash Balance,Solde de la banque / trésorerie
Banking,Bancaire
Barcode,Barcode
@@ -471,7 +471,7 @@
Case No. cannot be 0,Cas n ° ne peut pas être 0
Cash,Espèces
Cash In Hand,Votre exercice social commence le
-Cash Voucher,Bon trésorerie
+Cash Entry,Bon trésorerie
Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
Cash/Bank Account,Trésorerie / Compte bancaire
Casual Leave,Règles d'application des prix et de ristournes .
@@ -595,7 +595,7 @@
Contacts,S'il vous plaît entrer la quantité pour l'article {0}
Content,Teneur
Content Type,Type de contenu
-Contra Voucher,Bon Contra
+Contra Entry,Bon Contra
Contract,contrat
Contract End Date,Date de fin du contrat
Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
@@ -626,7 +626,7 @@
Country Name,Nom Pays
Country wise default Address Templates,Modèles pays sage d'adresses par défaut
"Country, Timezone and Currency","Pays , Fuseau horaire et devise"
-Create Bank Voucher for the total salary paid for the above selected criteria,Créer Chèques de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnées
+Create Bank Entry for the total salary paid for the above selected criteria,Créer Chèques de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnées
Create Customer,créer clientèle
Create Material Requests,Créer des demandes de matériel
Create New,créer un nouveau
@@ -648,7 +648,7 @@
Credit,Crédit
Credit Amt,Crédit Amt
Credit Card,Carte de crédit
-Credit Card Voucher,Bon de carte de crédit
+Credit Card Entry,Bon de carte de crédit
Credit Controller,Credit Controller
Credit Days,Jours de crédit
Credit Limit,Limite de crédit
@@ -980,7 +980,7 @@
Excise Duty Edu Cess 2,Droits d'accise Edu Cess 2
Excise Duty SHE Cess 1,Droits d'accise ELLE Cess 1
Excise Page Number,Numéro de page d'accise
-Excise Voucher,Bon d'accise
+Excise Entry,Bon d'accise
Execution,exécution
Executive Search,Executive Search
Exemption Limit,Limite d'exemption
@@ -1076,7 +1076,7 @@
Fraction,Fraction
Fraction Units,Unités fraction
Freeze Stock Entries,Congeler entrées en stocks
-Freeze Stocks Older Than [Days],Vous ne pouvez pas entrer bon actuelle dans «Contre Journal Voucher ' colonne
+Freeze Stocks Older Than [Days],Vous ne pouvez pas entrer bon actuelle dans «Contre Journal Entry ' colonne
Freight and Forwarding Charges,Fret et d'envoi en sus
Friday,Vendredi
From,À partir de
@@ -1328,7 +1328,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Période facture et la période de facturation Pour les dates obligatoires pour la facture récurrente
Invoice Period To,Période facture Pour
Invoice Type,Type de facture
-Invoice/Journal Voucher Details,Facture / Journal Chèques Détails
+Invoice/Journal Entry Details,Facture / Journal Chèques Détails
Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
Is Active,Est active
Is Advance,Est-Advance
@@ -1458,11 +1458,11 @@
Jobs Email Settings,Paramètres de messagerie Emploi
Journal Entries,Journal Entries
Journal Entry,Journal Entry
-Journal Voucher,Bon Journal
+Journal Entry,Bon Journal
Journal Entry Account,Détail pièce de journal
Journal Entry Account No,Détail Bon Journal No
-Journal Voucher {0} does not have account {1} or already matched,Journal Bon {0} n'a pas encore compte {1} ou déjà identifié
-Journal Vouchers {0} are un-linked,Date de livraison prévue ne peut pas être avant ventes Date de commande
+Journal Entry {0} does not have account {1} or already matched,Journal Bon {0} n'a pas encore compte {1} ou déjà identifié
+Journal Entries {0} are un-linked,Date de livraison prévue ne peut pas être avant ventes Date de commande
Keep a track of communication related to this enquiry which will help for future reference.,Gardez une trace de la communication liée à cette enquête qui aidera pour référence future.
Keep it web friendly 900px (w) by 100px (h),Gardez web 900px amical ( w) par 100px ( h )
Key Performance Area,Section de performance clé
@@ -1577,7 +1577,7 @@
Major/Optional Subjects,Sujets principaux / en option
Make ,Make
Make Accounting Entry For Every Stock Movement,Faites Entrée Comptabilité Pour chaque mouvement Stock
-Make Bank Voucher,Assurez-Bon Banque
+Make Bank Entry,Assurez-Bon Banque
Make Credit Note,Assurez Note de crédit
Make Debit Note,Assurez- notes de débit
Make Delivery,Assurez- livraison
@@ -3097,7 +3097,7 @@
Update Series Number,Numéro de série mise à jour
Update Stock,Mise à jour Stock
Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Date d'autorisation de mise à jour des entrées de journal marqué comme « Banque Bons »
+Update clearance date of Journal Entries marked as 'Bank Entry',Date d'autorisation de mise à jour des entrées de journal marqué comme « Banque Bons »
Updated,Mise à jour
Updated Birthday Reminders,Mise à jour anniversaire rappels
Upload Attendance,Téléchargez Participation
@@ -3235,7 +3235,7 @@
Write Off Based On,Ecrire Off Basé sur
Write Off Cost Center,Ecrire Off Centre de coûts
Write Off Outstanding Amount,Ecrire Off Encours
-Write Off Voucher,Ecrire Off Bon
+Write Off Entry,Ecrire Off Bon
Wrong Template: Unable to find head row.,Modèle tort: Impossible de trouver la ligne de tête.
Year,Année
Year Closed,L'année est fermée
@@ -3253,7 +3253,7 @@
You can enter the minimum quantity of this item to be ordered.,Vous pouvez entrer la quantité minimale de cet élément à commander.
You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Vous ne pouvez pas entrer à la fois bon de livraison et la facture de vente n ° n ° S'il vous plaît entrer personne.
-You can not enter current voucher in 'Against Journal Voucher' column,"D'autres comptes peuvent être faites dans les groupes , mais les entrées peuvent être faites contre Ledger"
+You can not enter current voucher in 'Against Journal Entry' column,"D'autres comptes peuvent être faites dans les groupes , mais les entrées peuvent être faites contre Ledger"
You can set Default Bank Account in Company master,Articles en attente {0} mise à jour
You can start by selecting backup frequency and granting access for sync,Vous pouvez commencer par sélectionner la fréquence de sauvegarde et d'accorder l'accès pour la synchronisation
You can submit this Stock Reconciliation.,Vous pouvez soumettre cette Stock réconciliation .
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index df43d85..2693e46 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -152,8 +152,8 @@
Against Document No,दस्तावेज़ के खिलाफ कोई
Against Expense Account,व्यय खाते के खिलाफ
Against Income Account,आय खाता के खिलाफ
-Against Journal Voucher,जर्नल वाउचर के खिलाफ
-Against Journal Voucher {0} does not have any unmatched {1} entry,जर्नल वाउचर के खिलाफ {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
+Against Journal Entry,जर्नल वाउचर के खिलाफ
+Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल वाउचर के खिलाफ {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
Against Purchase Invoice,खरीद चालान के खिलाफ
Against Sales Invoice,बिक्री चालान के खिलाफ
Against Sales Order,बिक्री के आदेश के खिलाफ
@@ -335,7 +335,7 @@
Bank Reconciliation,बैंक समाधान
Bank Reconciliation Detail,बैंक सुलह विस्तार
Bank Reconciliation Statement,बैंक समाधान विवरण
-Bank Voucher,बैंक वाउचर
+Bank Entry,बैंक वाउचर
Bank/Cash Balance,बैंक / नकद शेष
Banking,बैंकिंग
Barcode,बारकोड
@@ -470,7 +470,7 @@
Case No. cannot be 0,मुकदमा संख्या 0 नहीं हो सकता
Cash,नकद
Cash In Hand,रोकड़ शेष
-Cash Voucher,कैश वाउचर
+Cash Entry,कैश वाउचर
Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
Cash/Bank Account,नकद / बैंक खाता
Casual Leave,आकस्मिक छुट्टी
@@ -594,7 +594,7 @@
Contacts,संपर्क
Content,सामग्री
Content Type,सामग्री प्रकार
-Contra Voucher,कॉन्ट्रा वाउचर
+Contra Entry,कॉन्ट्रा वाउचर
Contract,अनुबंध
Contract End Date,अनुबंध समाप्ति तिथि
Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
@@ -625,7 +625,7 @@
Country Name,देश का नाम
Country wise default Address Templates,देश बुद्धिमान डिफ़ॉल्ट पता टेम्पलेट्स
"Country, Timezone and Currency","देश , समय क्षेत्र और मुद्रा"
-Create Bank Voucher for the total salary paid for the above selected criteria,कुल ऊपर चयनित मानदंड के लिए वेतन भुगतान के लिए बैंक वाउचर बनाएँ
+Create Bank Entry for the total salary paid for the above selected criteria,कुल ऊपर चयनित मानदंड के लिए वेतन भुगतान के लिए बैंक वाउचर बनाएँ
Create Customer,ग्राहक बनाएँ
Create Material Requests,सामग्री अनुरोध बनाएँ
Create New,नई बनाएँ
@@ -647,7 +647,7 @@
Credit,श्रेय
Credit Amt,क्रेडिट राशि
Credit Card,क्रेडिट कार्ड
-Credit Card Voucher,क्रेडिट कार्ड वाउचर
+Credit Card Entry,क्रेडिट कार्ड वाउचर
Credit Controller,क्रेडिट नियंत्रक
Credit Days,क्रेडिट दिन
Credit Limit,साख सीमा
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,उत्पाद शुल्क शिक्षा उपकर 2
Excise Duty SHE Cess 1,एक्साइज ड्यूटी वह उपकर 1
Excise Page Number,आबकारी पृष्ठ संख्या
-Excise Voucher,आबकारी वाउचर
+Excise Entry,आबकारी वाउचर
Execution,निष्पादन
Executive Search,कार्यकारी खोज
Exemption Limit,छूट की सीमा
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,चालान आवर्ती के लिए अनिवार्य तिथियों के लिए और चालान काल से चालान अवधि
Invoice Period To,के लिए चालान अवधि
Invoice Type,चालान का प्रकार
-Invoice/Journal Voucher Details,चालान / जर्नल वाउचर विवरण
+Invoice/Journal Entry Details,चालान / जर्नल वाउचर विवरण
Invoiced Amount (Exculsive Tax),चालान राशि ( Exculsive टैक्स )
Is Active,सक्रिय है
Is Advance,अग्रिम है
@@ -1457,11 +1457,11 @@
Jobs Email Settings,नौकरियां ईमेल सेटिंग
Journal Entries,जर्नल प्रविष्टियां
Journal Entry,जर्नल प्रविष्टि
-Journal Voucher,जर्नल वाउचर
+Journal Entry,जर्नल वाउचर
Journal Entry Account,जर्नल वाउचर विस्तार
Journal Entry Account No,जर्नल वाउचर विस्तार नहीं
-Journal Voucher {0} does not have account {1} or already matched,जर्नल वाउचर {0} खाता नहीं है {1} या पहले से ही मेल नहीं खाते
-Journal Vouchers {0} are un-linked,जर्नल वाउचर {0} संयुक्त राष्ट्र से जुड़े हुए हैं
+Journal Entry {0} does not have account {1} or already matched,जर्नल वाउचर {0} खाता नहीं है {1} या पहले से ही मेल नहीं खाते
+Journal Entries {0} are un-linked,जर्नल वाउचर {0} संयुक्त राष्ट्र से जुड़े हुए हैं
Keep a track of communication related to this enquiry which will help for future reference.,जांच है जो भविष्य में संदर्भ के लिए मदद करने के लिए संबंधित संचार का ट्रैक रखें.
Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
Key Performance Area,परफ़ॉर्मेंस क्षेत्र
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,मेजर / वैकल्पिक विषय
Make ,Make
Make Accounting Entry For Every Stock Movement,हर शेयर आंदोलन के लिए लेखा प्रविष्टि बनाओ
-Make Bank Voucher,बैंक वाउचर
+Make Bank Entry,बैंक वाउचर
Make Credit Note,क्रेडिट नोट बनाने
Make Debit Note,डेबिट नोट बनाने
Make Delivery,वितरण करना
@@ -3096,7 +3096,7 @@
Update Series Number,अद्यतन सीरीज नंबर
Update Stock,स्टॉक अद्यतन
Update bank payment dates with journals.,अद्यतन बैंक भुगतान पत्रिकाओं के साथ तिथियाँ.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',जर्नल प्रविष्टियों का अद्यतन निकासी की तारीख ' बैंक वाउचर ' के रूप में चिह्नित
+Update clearance date of Journal Entries marked as 'Bank Entry',जर्नल प्रविष्टियों का अद्यतन निकासी की तारीख ' बैंक वाउचर ' के रूप में चिह्नित
Updated,अद्यतित
Updated Birthday Reminders,नवीनीकृत जन्मदिन अनुस्मारक
Upload Attendance,उपस्थिति अपलोड
@@ -3234,7 +3234,7 @@
Write Off Based On,के आधार पर बंद लिखने के लिए
Write Off Cost Center,ऑफ लागत केंद्र लिखें
Write Off Outstanding Amount,ऑफ बकाया राशि लिखें
-Write Off Voucher,ऑफ वाउचर लिखें
+Write Off Entry,ऑफ वाउचर लिखें
Wrong Template: Unable to find head row.,गलत साँचा: सिर पंक्ति पाने में असमर्थ.
Year,वर्ष
Year Closed,साल बंद कर दिया
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,आप इस मद की न्यूनतम मात्रा में करने के लिए आदेश दिया जा में प्रवेश कर सकते हैं.
You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,आप नहीं दोनों डिलिवरी नोट में प्रवेश नहीं कर सकते हैं और बिक्री चालान नहीं किसी भी एक दर्ज करें.
-You can not enter current voucher in 'Against Journal Voucher' column,आप स्तंभ ' जर्नल वाउचर के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
+You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ ' जर्नल वाउचर के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
You can set Default Bank Account in Company master,आप कंपनी मास्टर में डिफ़ॉल्ट बैंक खाता सेट कर सकते हैं
You can start by selecting backup frequency and granting access for sync,आप बैकअप आवृत्ति का चयन और सिंक के लिए पहुँच प्रदान कर शुरू कर सकते हैं
You can submit this Stock Reconciliation.,आप इस स्टॉक सुलह प्रस्तुत कर सकते हैं .
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 550eb0d..58ac6b2 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -152,8 +152,8 @@
Against Document No,Protiv dokumentu nema
Against Expense Account,Protiv Rashodi račun
Against Income Account,Protiv računu dohotka
-Against Journal Voucher,Protiv Journal Voucheru
-Against Journal Voucher {0} does not have any unmatched {1} entry,Protiv Journal vaučer {0} nema premca {1} unos
+Against Journal Entry,Protiv Journal Entryu
+Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal vaučer {0} nema premca {1} unos
Against Purchase Invoice,Protiv Kupnja fakture
Against Sales Invoice,Protiv prodaje fakture
Against Sales Order,Protiv prodajnog naloga
@@ -335,7 +335,7 @@
Bank Reconciliation,Banka pomirenje
Bank Reconciliation Detail,Banka Pomirenje Detalj
Bank Reconciliation Statement,Izjava banka pomirenja
-Bank Voucher,Banka bon
+Bank Entry,Banka bon
Bank/Cash Balance,Banka / saldo
Banking,bankarstvo
Barcode,Barkod
@@ -470,7 +470,7 @@
Case No. cannot be 0,Slučaj broj ne može biti 0
Cash,Gotovina
Cash In Hand,Novac u blagajni
-Cash Voucher,Novac bon
+Cash Entry,Novac bon
Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
Cash/Bank Account,Novac / bankovni račun
Casual Leave,Casual dopust
@@ -594,7 +594,7 @@
Contacts,Kontakti
Content,Sadržaj
Content Type,Vrsta sadržaja
-Contra Voucher,Contra bon
+Contra Entry,Contra bon
Contract,ugovor
Contract End Date,Ugovor Datum završetka
Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
@@ -625,7 +625,7 @@
Country Name,Država Ime
Country wise default Address Templates,Država mudar zadana adresa predlošci
"Country, Timezone and Currency","Država , vremenske zone i valute"
-Create Bank Voucher for the total salary paid for the above selected criteria,Stvaranje Bank bon za ukupne plaće isplaćene za gore odabranih kriterija
+Create Bank Entry for the total salary paid for the above selected criteria,Stvaranje Bank bon za ukupne plaće isplaćene za gore odabranih kriterija
Create Customer,izraditi korisnika
Create Material Requests,Stvaranje materijalni zahtijevi
Create New,Stvori novo
@@ -647,7 +647,7 @@
Credit,Kredit
Credit Amt,Kreditne Amt
Credit Card,kreditna kartica
-Credit Card Voucher,Kreditne kartice bon
+Credit Card Entry,Kreditne kartice bon
Credit Controller,Kreditne kontroler
Credit Days,Kreditne Dani
Credit Limit,Kreditni limit
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Trošarina Edu Posebni porez 2
Excise Duty SHE Cess 1,Trošarina ONA Posebni porez na 1
Excise Page Number,Trošarina Broj stranice
-Excise Voucher,Trošarina bon
+Excise Entry,Trošarina bon
Execution,izvršenje
Executive Search,Executive Search
Exemption Limit,Izuzeće granica
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Račun razdoblju od računa i period za datume obveznih za ponavljajuće fakture
Invoice Period To,Račun Razdoblje Da
Invoice Type,Tip fakture
-Invoice/Journal Voucher Details,Račun / Časopis bon Detalji
+Invoice/Journal Entry Details,Račun / Časopis bon Detalji
Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
Is Active,Je aktivna
Is Advance,Je Predujam
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Poslovi Postavke e-pošte
Journal Entries,Časopis upisi
Journal Entry,Časopis Stupanje
-Journal Voucher,Časopis bon
+Journal Entry,Časopis bon
Journal Entry Account,Časopis bon Detalj
Journal Entry Account No,Časopis bon Detalj Ne
-Journal Voucher {0} does not have account {1} or already matched,Časopis bon {0} nema račun {1} ili već usklađeni
-Journal Vouchers {0} are un-linked,Časopis bon {0} su UN -linked
+Journal Entry {0} does not have account {1} or already matched,Časopis bon {0} nema račun {1} ili već usklađeni
+Journal Entries {0} are un-linked,Časopis bon {0} su UN -linked
Keep a track of communication related to this enquiry which will help for future reference.,Držite pratiti komunikacije vezane uz ovaj upit koji će vam pomoći za buduću referencu.
Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
Key Performance Area,Key Performance Area
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Glavni / Izborni predmeti
Make ,Make
Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
-Make Bank Voucher,Napravite Bank bon
+Make Bank Entry,Napravite Bank bon
Make Credit Note,Provjerite Credit Note
Make Debit Note,Provjerite terećenju
Make Delivery,bi isporuka
@@ -3096,7 +3096,7 @@
Update Series Number,Update serije Broj
Update Stock,Ažurirajte Stock
Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',"Datum Update klirens navoda označene kao ""Banka bon '"
+Update clearance date of Journal Entries marked as 'Bank Entry',"Datum Update klirens navoda označene kao ""Banka bon '"
Updated,Obnovljeno
Updated Birthday Reminders,Obnovljeno Rođendan Podsjetnici
Upload Attendance,Upload Attendance
@@ -3234,7 +3234,7 @@
Write Off Based On,Otpis na temelju
Write Off Cost Center,Otpis troška
Write Off Outstanding Amount,Otpisati preostali iznos
-Write Off Voucher,Napišite Off bon
+Write Off Entry,Napišite Off bon
Wrong Template: Unable to find head row.,Pogrešna Predložak: Nije moguće pronaći glave red.
Year,Godina
Year Closed,Godina Zatvoreno
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Možete unijeti minimalnu količinu ove točke biti naređeno.
You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Vi ne možete unositi oba isporuke Napomena Ne i prodaje Račun br Unesite bilo jedno .
-You can not enter current voucher in 'Against Journal Voucher' column,Ne možete unijeti trenutni voucher u ' Protiv Journal vaučer ' kolonu
+You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni voucher u ' Protiv Journal vaučer ' kolonu
You can set Default Bank Account in Company master,Možete postaviti Default bankovni račun u gospodara tvrtke
You can start by selecting backup frequency and granting access for sync,Možete početi odabirom sigurnosnu frekvenciju i davanje pristupa za sinkronizaciju
You can submit this Stock Reconciliation.,Možete poslati ovu zaliha pomirenja .
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 658fa42..a346a63 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -152,8 +152,8 @@
Against Document No,Melawan Dokumen Tidak
Against Expense Account,Terhadap Beban Akun
Against Income Account,Terhadap Akun Penghasilan
-Against Journal Voucher,Melawan Journal Voucher
-Against Journal Voucher {0} does not have any unmatched {1} entry,Terhadap Journal Voucher {0} tidak memiliki tertandingi {1} entri
+Against Journal Entry,Melawan Journal Entry
+Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak memiliki tertandingi {1} entri
Against Purchase Invoice,Terhadap Purchase Invoice
Against Sales Invoice,Terhadap Faktur Penjualan
Against Sales Order,Terhadap Sales Order
@@ -335,7 +335,7 @@
Bank Reconciliation,5. Bank Reconciliation (Rekonsiliasi Bank)
Bank Reconciliation Detail,Rekonsiliasi Bank Detil
Bank Reconciliation Statement,Pernyataan Bank Rekonsiliasi
-Bank Voucher,Bank Voucher
+Bank Entry,Bank Entry
Bank/Cash Balance,Bank / Cash Balance
Banking,Perbankan
Barcode,barcode
@@ -470,7 +470,7 @@
Case No. cannot be 0,Kasus No tidak bisa 0
Cash,kas
Cash In Hand,Cash In Hand
-Cash Voucher,Voucher Cash
+Cash Entry,Voucher Cash
Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
Cash/Bank Account,Rekening Kas / Bank
Casual Leave,Santai Cuti
@@ -594,7 +594,7 @@
Contacts,Kontak
Content,Isi Halaman
Content Type,Content Type
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,Kontrak
Contract End Date,Tanggal Kontrak End
Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
@@ -625,7 +625,7 @@
Country Name,Nama Negara
Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
"Country, Timezone and Currency","Country, Timezone dan Mata Uang"
-Create Bank Voucher for the total salary paid for the above selected criteria,Buat Bank Voucher untuk gaji total yang dibayarkan untuk kriteria pilihan di atas
+Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk gaji total yang dibayarkan untuk kriteria pilihan di atas
Create Customer,Buat Pelanggan
Create Material Requests,Buat Permintaan Material
Create New,Buat New
@@ -647,7 +647,7 @@
Credit,Piutang
Credit Amt,Kredit Jumlah Yang
Credit Card,Kartu Kredit
-Credit Card Voucher,Voucher Kartu Kredit
+Credit Card Entry,Voucher Kartu Kredit
Credit Controller,Kontroler Kredit
Credit Days,Hari Kredit
Credit Limit,Batas Kredit
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Cukai Edu Cess 2
Excise Duty SHE Cess 1,Cukai SHE Cess 1
Excise Page Number,Jumlah Cukai Halaman
-Excise Voucher,Voucher Cukai
+Excise Entry,Voucher Cukai
Execution,Eksekusi
Executive Search,Pencarian eksekutif
Exemption Limit,Batas Pembebasan
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Faktur Periode Dari dan Faktur Period Untuk tanggal wajib untuk berulang faktur
Invoice Period To,Periode Faktur Untuk
Invoice Type,Invoice Type
-Invoice/Journal Voucher Details,Invoice / Journal Entry Account
+Invoice/Journal Entry Details,Invoice / Journal Entry Account
Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
Is Active,Aktif
Is Advance,Apakah Muka
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Pengaturan Jobs Email
Journal Entries,Entries Journal
Journal Entry,Jurnal Entri
-Journal Voucher,Journal Voucher
-Journal Entry Account,Journal Voucher Detil
-Journal Entry Account No,Journal Voucher Detil ada
-Journal Voucher {0} does not have account {1} or already matched,Journal Voucher {0} tidak memiliki akun {1} atau sudah cocok
-Journal Vouchers {0} are un-linked,Journal Voucher {0} yang un-linked
+Journal Entry,Journal Entry
+Journal Entry Account,Journal Entry Detil
+Journal Entry Account No,Journal Entry Detil ada
+Journal Entry {0} does not have account {1} or already matched,Journal Entry {0} tidak memiliki akun {1} atau sudah cocok
+Journal Entries {0} are un-linked,Journal Entry {0} yang un-linked
Keep a track of communication related to this enquiry which will help for future reference.,Menyimpan melacak komunikasi yang berkaitan dengan penyelidikan ini yang akan membantu untuk referensi di masa mendatang.
Keep it web friendly 900px (w) by 100px (h),Simpan web 900px ramah (w) oleh 100px (h)
Key Performance Area,Key Bidang Kinerja
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Mayor / Opsional Subjek
Make ,Make
Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Gerakan Stock
-Make Bank Voucher,Membuat Bank Voucher
+Make Bank Entry,Membuat Bank Entry
Make Credit Note,Membuat Nota Kredit
Make Debit Note,Membuat Debit Note
Make Delivery,Membuat Pengiriman
@@ -3096,7 +3096,7 @@
Update Series Number,Pembaruan Series Number
Update Stock,Perbarui Stock
Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Tanggal pembaruan clearance Entries Journal ditandai sebagai 'Bank Voucher'
+Update clearance date of Journal Entries marked as 'Bank Entry',Tanggal pembaruan clearance Entries Journal ditandai sebagai 'Bank Entry'
Updated,Diperbarui
Updated Birthday Reminders,Diperbarui Ulang Tahun Pengingat
Upload Attendance,Upload Kehadiran
@@ -3234,7 +3234,7 @@
Write Off Based On,Menulis Off Berbasis On
Write Off Cost Center,Menulis Off Biaya Pusat
Write Off Outstanding Amount,Menulis Off Jumlah Outstanding
-Write Off Voucher,Menulis Off Voucher
+Write Off Entry,Menulis Off Voucher
Wrong Template: Unable to find head row.,Template yang salah: Tidak dapat menemukan baris kepala.
Year,Tahun
Year Closed,Tahun Ditutup
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Anda dapat memasukkan jumlah minimum dari item ini yang akan dipesan.
You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah tingkat jika BOM disebutkan agianst item
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Anda tidak dapat memasukkan kedua Delivery Note ada dan Faktur Penjualan No Masukkan salah satu.
-You can not enter current voucher in 'Against Journal Voucher' column,Anda tidak bisa masuk voucher saat ini di 'Melawan Journal Voucher' kolom
+You can not enter current voucher in 'Against Journal Entry' column,Anda tidak bisa masuk voucher saat ini di 'Melawan Journal Entry' kolom
You can set Default Bank Account in Company master,Anda dapat mengatur default Bank Account menguasai Perusahaan
You can start by selecting backup frequency and granting access for sync,Anda dapat memulai dengan memilih frekuensi backup dan memberikan akses untuk sinkronisasi
You can submit this Stock Reconciliation.,Anda bisa mengirimkan ini Stock Rekonsiliasi.
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 488423a..8421a5b 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -152,8 +152,8 @@
Against Document No,Per Documento N
Against Expense Account,Per Spesa Conto
Against Income Account,Per Reddito Conto
-Against Journal Voucher,Per Buono Acquisto
-Against Journal Voucher {0} does not have any unmatched {1} entry,Contro ufficiale Voucher {0} non ha alcun ineguagliata {1} entry
+Against Journal Entry,Per Buono Acquisto
+Against Journal Entry {0} does not have any unmatched {1} entry,Contro ufficiale Voucher {0} non ha alcun ineguagliata {1} entry
Against Purchase Invoice,Per Fattura Acquisto
Against Sales Invoice,Per Fattura Vendita
Against Sales Order,Contro Sales Order
@@ -335,7 +335,7 @@
Bank Reconciliation,Conciliazione Banca
Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
Bank Reconciliation Statement,Prospetto di Riconciliazione Banca
-Bank Voucher,Buono Banca
+Bank Entry,Buono Banca
Bank/Cash Balance,Banca/Contanti Saldo
Banking,bancario
Barcode,Codice a barre
@@ -470,7 +470,7 @@
Case No. cannot be 0,Caso No. Non può essere 0
Cash,Contante
Cash In Hand,Cash In Hand
-Cash Voucher,Buono Contanti
+Cash Entry,Buono Contanti
Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
Cash/Bank Account,Conto Contanti/Banca
Casual Leave,Casual Leave
@@ -594,7 +594,7 @@
Contacts,Contatti
Content,Contenuto
Content Type,Tipo Contenuto
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,contratto
Contract End Date,Data fine Contratto
Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
@@ -625,7 +625,7 @@
Country Name,Nome Nazione
Country wise default Address Templates,Modelli Country saggio di default Indirizzo
"Country, Timezone and Currency","Paese , Fuso orario e valuta"
-Create Bank Voucher for the total salary paid for the above selected criteria,Crea Buono Bancario per il totale dello stipendio da pagare per i seguenti criteri
+Create Bank Entry for the total salary paid for the above selected criteria,Crea Buono Bancario per il totale dello stipendio da pagare per i seguenti criteri
Create Customer,Crea clienti
Create Material Requests,Creare Richieste Materiale
Create New,Crea nuovo
@@ -647,7 +647,7 @@
Credit,Credit
Credit Amt,Credit Amt
Credit Card,carta di credito
-Credit Card Voucher,Carta Buono di credito
+Credit Card Entry,Carta Buono di credito
Credit Controller,Controllare Credito
Credit Days,Giorni Credito
Credit Limit,Limite Credito
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Excise Duty Edu Cess 2
Excise Duty SHE Cess 1,Excise Duty SHE Cess 1
Excise Page Number,Accise Numero Pagina
-Excise Voucher,Buono Accise
+Excise Entry,Buono Accise
Execution,esecuzione
Executive Search,executive Search
Exemption Limit,Limite Esenzione
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Fattura Periodo Da e fattura Periodo Per le date obbligatorie per la fattura ricorrenti
Invoice Period To,Periodo fattura per
Invoice Type,Tipo Fattura
-Invoice/Journal Voucher Details,Fattura / Journal Voucher Dettagli
+Invoice/Journal Entry Details,Fattura / Journal Entry Dettagli
Invoiced Amount (Exculsive Tax),Importo fatturato ( Exculsive Tax)
Is Active,È attivo
Is Advance,È Advance
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Impostazioni email Lavoro
Journal Entries,Prime note
Journal Entry,Journal Entry
-Journal Voucher,Journal Voucher
+Journal Entry,Journal Entry
Journal Entry Account,Journal Entry Account
Journal Entry Account No,Journal Entry Account No
-Journal Voucher {0} does not have account {1} or already matched,Journal Voucher {0} non ha conto {1} o già abbinate
-Journal Vouchers {0} are un-linked,Diario Buoni {0} sono non- linked
+Journal Entry {0} does not have account {1} or already matched,Journal Entry {0} non ha conto {1} o già abbinate
+Journal Entries {0} are un-linked,Diario Buoni {0} sono non- linked
Keep a track of communication related to this enquiry which will help for future reference.,Tenere una traccia delle comunicazioni relative a questa indagine che contribuirà per riferimento futuro.
Keep it web friendly 900px (w) by 100px (h),Keep it web amichevole 900px ( w ) di 100px ( h )
Key Performance Area,Area Key Performance
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Principali / Opzionale Soggetti
Make ,Make
Make Accounting Entry For Every Stock Movement,Fai Entry Accounting per ogni Archivio Movimento
-Make Bank Voucher,Fai Voucher Banca
+Make Bank Entry,Fai Voucher Banca
Make Credit Note,Fai la nota di credito
Make Debit Note,Fai la nota di addebito
Make Delivery,effettuare la consegna
@@ -3096,7 +3096,7 @@
Update Series Number,Aggiornamento Numero di Serie
Update Stock,Aggiornare Archivio
Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',"Data di aggiornamento della respinta corta di voci di diario contrassegnato come "" Buoni Banca '"
+Update clearance date of Journal Entries marked as 'Bank Entry',"Data di aggiornamento della respinta corta di voci di diario contrassegnato come "" Buoni Banca '"
Updated,Aggiornato
Updated Birthday Reminders,Aggiornato Compleanno Promemoria
Upload Attendance,Carica presenze
@@ -3234,7 +3234,7 @@
Write Off Based On,Scrivi Off Basato Su
Write Off Cost Center,Scrivi Off Centro di costo
Write Off Outstanding Amount,Scrivi Off eccezionale Importo
-Write Off Voucher,Scrivi Off Voucher
+Write Off Entry,Scrivi Off Voucher
Wrong Template: Unable to find head row.,Template Sbagliato: Impossibile trovare la linea di testa.
Year,Anno
Year Closed,Anno Chiuso
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,È possibile inserire la quantità minima di questo oggetto da ordinare.
You can not change rate if BOM mentioned agianst any item,Non è possibile modificare tariffa se BOM menzionato agianst tutto l'articolo
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Non è possibile inserire sia Consegna Nota n e Fattura n Inserisci nessuno.
-You can not enter current voucher in 'Against Journal Voucher' column,Non è possibile immettere voucher di corrente in ' Contro ufficiale Voucher ' colonna
+You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere voucher di corrente in ' Contro ufficiale Voucher ' colonna
You can set Default Bank Account in Company master,È possibile impostare di default conto bancario in master Società
You can start by selecting backup frequency and granting access for sync,È possibile avviare selezionando la frequenza di backup e di concedere l'accesso per la sincronizzazione
You can submit this Stock Reconciliation.,Puoi inviare questo Archivio Riconciliazione.
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 6585666..61690cd 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -152,8 +152,8 @@
Against Document No,ドキュメントNoに対する
Against Expense Account,費用勘定に対する
Against Income Account,所得収支に対する
-Against Journal Voucher,ジャーナルバウチャーに対する
-Against Journal Voucher {0} does not have any unmatched {1} entry,ジャーナルバウチャーに対して{0}は、比類のない{1}のエントリがありません
+Against Journal Entry,ジャーナルバウチャーに対する
+Against Journal Entry {0} does not have any unmatched {1} entry,ジャーナルバウチャーに対して{0}は、比類のない{1}のエントリがありません
Against Purchase Invoice,購入の請求書に対する
Against Sales Invoice,納品書に対する
Against Sales Order,受注に対する
@@ -335,7 +335,7 @@
Bank Reconciliation,銀行和解
Bank Reconciliation Detail,銀行和解の詳細
Bank Reconciliation Statement,銀行和解声明
-Bank Voucher,銀行の領収書
+Bank Entry,銀行の領収書
Bank/Cash Balance,銀行/現金残高
Banking,銀行業務
Barcode,バーコード
@@ -470,7 +470,7 @@
Case No. cannot be 0,ケース番号は0にすることはできません
Cash,現金
Cash In Hand,手持ちの現金
-Cash Voucher,金券
+Cash Entry,金券
Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
Cash/Bank Account,現金/銀行口座
Casual Leave,臨時休暇
@@ -594,7 +594,7 @@
Contacts,連絡先
Content,内容
Content Type,コンテンツの種類
-Contra Voucher,コントラバウチャー
+Contra Entry,コントラバウチャー
Contract,契約書
Contract End Date,契約終了日
Contract End Date must be greater than Date of Joining,契約終了日は、参加の日よりも大きくなければならない
@@ -625,7 +625,7 @@
Country Name,国名
Country wise default Address Templates,国ごとのデフォルトのアドレス·テンプレート
"Country, Timezone and Currency",国、タイムゾーンと通貨
-Create Bank Voucher for the total salary paid for the above selected criteria,上で選択した基準に支払わ総給与のために銀行券を作成
+Create Bank Entry for the total salary paid for the above selected criteria,上で選択した基準に支払わ総給与のために銀行券を作成
Create Customer,顧客を作成
Create Material Requests,素材の要求を作成
Create New,新規作成
@@ -647,7 +647,7 @@
Credit,クレジット
Credit Amt,クレジットアマウント
Credit Card,クレジットカード
-Credit Card Voucher,クレジットカードのバウチャー
+Credit Card Entry,クレジットカードのバウチャー
Credit Controller,クレジットコントローラ
Credit Days,クレジット日数
Credit Limit,支払いの上限
@@ -981,7 +981,7 @@
Excise Duty Edu Cess 2,物品税エドゥ目的税2
Excise Duty SHE Cess 1,物品税SHE目的税1
Excise Page Number,物品税ページ番号
-Excise Voucher,物品税バウチャー
+Excise Entry,物品税バウチャー
Execution,実行
Executive Search,エグゼクティブサーチ
Exemption Limit,免除の制限
@@ -1329,7 +1329,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,請求書を定期的に必須の日付へと請求期間からの請求書の期間
Invoice Period To,請求書の期間
Invoice Type,請求書の種類
-Invoice/Journal Voucher Details,請求書/ジャーナルクーポン詳細
+Invoice/Journal Entry Details,請求書/ジャーナルクーポン詳細
Invoiced Amount (Exculsive Tax),請求された金額（Exculsive税）
Is Active,アクティブである
Is Advance,進歩である
@@ -1459,11 +1459,11 @@
Jobs Email Settings,仕事のメール設定
Journal Entries,仕訳
Journal Entry,仕訳
-Journal Voucher,伝票
+Journal Entry,伝票
Journal Entry Account,伝票の詳細
Journal Entry Account No,伝票の詳細番号
-Journal Voucher {0} does not have account {1} or already matched,伝票は{0}アカウントを持っていない{1}、またはすでに一致
-Journal Vouchers {0} are un-linked,ジャーナルバウチャー{0}アンリンクされている
+Journal Entry {0} does not have account {1} or already matched,伝票は{0}アカウントを持っていない{1}、またはすでに一致
+Journal Entries {0} are un-linked,ジャーナルバウチャー{0}アンリンクされている
Keep a track of communication related to this enquiry which will help for future reference.,今後の参考のために役立ちます。この照会に関連した通信を追跡する。
Keep it web friendly 900px (w) by 100px (h),900px(w)100px(h)にすることで適用それを維持する。
Key Performance Area,重要実行分野
@@ -1578,7 +1578,7 @@
Major/Optional Subjects,大手/オプション科目
Make ,作成する
Make Accounting Entry For Every Stock Movement,すべての株式の動きの会計処理のエントリを作成
-Make Bank Voucher,銀行バウチャーを作る
+Make Bank Entry,銀行バウチャーを作る
Make Credit Note,クレジットメモしておきます
Make Debit Note,デビットメモしておきます
Make Delivery,配達をする
@@ -3103,7 +3103,7 @@
Update Series Number,シリーズ番号の更新
Update Stock,在庫の更新
Update bank payment dates with journals.,銀行支払日と履歴を更新して下さい。
-Update clearance date of Journal Entries marked as 'Bank Vouchers',履歴欄を「銀行決済」と明記してクリアランス日（清算日）を更新して下さい。
+Update clearance date of Journal Entries marked as 'Bank Entry',履歴欄を「銀行決済」と明記してクリアランス日（清算日）を更新して下さい。
Updated,更新済み
Updated Birthday Reminders,誕生日の事前通知の更新完了
Upload Attendance,参加者をアップロードする。（参加者をメインのコンピューターに送る。）
@@ -3243,7 +3243,7 @@
Write Off Based On,ベースオンを償却
Write Off Cost Center,原価の事業経費
Write Off Outstanding Amount,事業経費未払金額
-Write Off Voucher,事業経費領収書
+Write Off Entry,事業経費領収書
Wrong Template: Unable to find head row.,間違ったテンプレートです。：見出し／最初の行が見つかりません。
Year,年
Year Closed,年間休館
@@ -3262,7 +3262,7 @@
You can enter the minimum quantity of this item to be ordered.,最小限の数量からこの商品を注文することができます
You can not change rate if BOM mentioned agianst any item,部品表が否認した商品は、料金を変更することができません
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,納品書と売上請求書の両方を入力することはできません。どちらら一つを記入して下さい
-You can not enter current voucher in 'Against Journal Voucher' column,''アゲンストジャーナルバウチャー’’の欄に、最新の領収証を入力することはできません。
+You can not enter current voucher in 'Against Journal Entry' column,''アゲンストジャーナルバウチャー’’の欄に、最新の領収証を入力することはできません。
You can set Default Bank Account in Company master,あなたは、会社のマスターにメイン銀行口座を設定することができます
You can start by selecting backup frequency and granting access for sync,バックアップの頻度を選択し、同期 するためのアクセスに承諾することで始めることができます
You can submit this Stock Reconciliation.,あなたは、この株式調整を提出することができます。
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index b987788..17e9344 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -152,8 +152,8 @@
Against Document No,ಡಾಕ್ಯುಮೆಂಟ್ ನಂ ವಿರುದ್ಧ
Against Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
-Against Journal Voucher,ಜರ್ನಲ್ ಚೀಟಿ ವಿರುದ್ಧ
-Against Journal Voucher {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ಚೀಟಿ ವಿರುದ್ಧ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
+Against Journal Entry,ಜರ್ನಲ್ ಚೀಟಿ ವಿರುದ್ಧ
+Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ಚೀಟಿ ವಿರುದ್ಧ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
Against Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
Against Sales Order,ಮಾರಾಟದ ಆದೇಶದ ವಿರುದ್ಧ
@@ -335,7 +335,7 @@
Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
Bank Reconciliation Detail,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
Bank Reconciliation Statement,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ಹೇಳಿಕೆ
-Bank Voucher,ಬ್ಯಾಂಕ್ ಚೀಟಿ
+Bank Entry,ಬ್ಯಾಂಕ್ ಚೀಟಿ
Bank/Cash Balance,ಬ್ಯಾಂಕ್ / ನಗದು ಬ್ಯಾಲೆನ್ಸ್
Banking,ಲೇವಾದೇವಿ
Barcode,ಬಾರ್ಕೋಡ್
@@ -470,7 +470,7 @@
Case No. cannot be 0,ಪ್ರಕರಣ ಸಂಖ್ಯೆ 0 ಸಾಧ್ಯವಿಲ್ಲ
Cash,ನಗದು
Cash In Hand,ಕೈಯಲ್ಲಿ ನಗದು
-Cash Voucher,ನಗದು ಚೀಟಿ
+Cash Entry,ನಗದು ಚೀಟಿ
Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
Casual Leave,ರಜೆ
@@ -594,7 +594,7 @@
Contacts,ಸಂಪರ್ಕಗಳು
Content,ವಿಷಯ
Content Type,ವಿಷಯ ಪ್ರಕಾರ
-Contra Voucher,ಕಾಂಟ್ರಾ ಚೀಟಿ
+Contra Entry,ಕಾಂಟ್ರಾ ಚೀಟಿ
Contract,ಒಪ್ಪಂದ
Contract End Date,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ
Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
@@ -625,7 +625,7 @@
Country Name,ದೇಶದ ಹೆಸರು
Country wise default Address Templates,ದೇಶದ ಬುದ್ಧಿವಂತ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ಗಳು
"Country, Timezone and Currency","ದೇಶ , ಕಾಲ ವಲಯ ಮತ್ತು ಕರೆನ್ಸಿ"
-Create Bank Voucher for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡಗಳನ್ನು ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಚೀಟಿ ರಚಿಸಿ
+Create Bank Entry for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡಗಳನ್ನು ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಚೀಟಿ ರಚಿಸಿ
Create Customer,ಗ್ರಾಹಕ ರಚಿಸಿ
Create Material Requests,CreateMaterial ವಿನಂತಿಗಳು
Create New,ಹೊಸ ರಚಿಸಿ
@@ -647,7 +647,7 @@
Credit,ಕ್ರೆಡಿಟ್
Credit Amt,ಕ್ರೆಡಿಟ್ ಕಚೇರಿ
Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
-Credit Card Voucher,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಚೀಟಿ
+Credit Card Entry,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಚೀಟಿ
Credit Controller,ಕ್ರೆಡಿಟ್ ನಿಯಂತ್ರಕ
Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,ಅಬಕಾರಿ ಸುಂಕ ಶತಾವರಿ Cess 2
Excise Duty SHE Cess 1,ಅಬಕಾರಿ ಸುಂಕ ಶಿ Cess 1
Excise Page Number,ಅಬಕಾರಿ ಪುಟ ಸಂಖ್ಯೆ
-Excise Voucher,ಅಬಕಾರಿ ಚೀಟಿ
+Excise Entry,ಅಬಕಾರಿ ಚೀಟಿ
Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
Exemption Limit,ವಿನಾಯಿತಿ ಮಿತಿಯನ್ನು
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,ಸರಕುಪಟ್ಟಿ ಮತ್ತು ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕ ಸರಕುಪಟ್ಟಿ ಅವಧಿ
Invoice Period To,ಸರಕುಪಟ್ಟಿ ಅವಧಿ
Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-Invoice/Journal Voucher Details,ಸರಕುಪಟ್ಟಿ / ಜರ್ನಲ್ ಚೀಟಿ ವಿವರಗಳು
+Invoice/Journal Entry Details,ಸರಕುಪಟ್ಟಿ / ಜರ್ನಲ್ ಚೀಟಿ ವಿವರಗಳು
Invoiced Amount (Exculsive Tax),ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ ( ತೆರಿಗೆ Exculsive )
Is Active,ಸಕ್ರಿಯವಾಗಿದೆ
Is Advance,ಮುಂಗಡ ಹೊಂದಿದೆ
@@ -1457,11 +1457,11 @@
Jobs Email Settings,ಕೆಲಸ ಇಮೇಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
Journal Entries,ಜರ್ನಲ್ ನಮೂದುಗಳು
Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
-Journal Voucher,ಜರ್ನಲ್ ಚೀಟಿ
+Journal Entry,ಜರ್ನಲ್ ಚೀಟಿ
Journal Entry Account,ಜರ್ನಲ್ ಚೀಟಿ ವಿವರ
Journal Entry Account No,ಜರ್ನಲ್ ಚೀಟಿ ವಿವರ ನಂ
-Journal Voucher {0} does not have account {1} or already matched,ಜರ್ನಲ್ ಚೀಟಿ {0} {1} ಖಾತೆಯನ್ನು ಅಥವಾ ಈಗಾಗಲೇ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಇಲ್ಲ
-Journal Vouchers {0} are un-linked,ಜರ್ನಲ್ ರಶೀದಿ {0} UN- ಲಿಂಕ್
+Journal Entry {0} does not have account {1} or already matched,ಜರ್ನಲ್ ಚೀಟಿ {0} {1} ಖಾತೆಯನ್ನು ಅಥವಾ ಈಗಾಗಲೇ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಇಲ್ಲ
+Journal Entries {0} are un-linked,ಜರ್ನಲ್ ರಶೀದಿ {0} UN- ಲಿಂಕ್
Keep a track of communication related to this enquiry which will help for future reference.,ಭವಿಷ್ಯದ ಉಲ್ಲೇಖಕ್ಕಾಗಿ ಸಹಾಯ whichwill ಈ ವಿಚಾರಣೆ ಸಂಬಂಧಿಸಿದ ಸಂವಹನದ ಒಂದು ಜಾಡನ್ನು ಇರಿಸಿ.
Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
Key Performance Area,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,ಮೇಜರ್ / ಐಚ್ಛಿಕ ವಿಷಯಗಳ
Make ,Make
Make Accounting Entry For Every Stock Movement,ಪ್ರತಿ ಸ್ಟಾಕ್ ಚಳುವಳಿ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾಡಿ
-Make Bank Voucher,ಬ್ಯಾಂಕ್ ಚೀಟಿ ಮಾಡಿ
+Make Bank Entry,ಬ್ಯಾಂಕ್ ಚೀಟಿ ಮಾಡಿ
Make Credit Note,ಕ್ರೆಡಿಟ್ ಸ್ಕೋರ್ ಮಾಡಿ
Make Debit Note,ಡೆಬಿಟ್ ನೋಟ್ ಮಾಡಿ
Make Delivery,ಡೆಲಿವರಿ ಮಾಡಿ
@@ -3096,7 +3096,7 @@
Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು
Update bank payment dates with journals.,ಜರ್ನಲ್ ಬ್ಯಾಂಕಿಂಗ್ ಪಾವತಿ ದಿನಾಂಕ ನವೀಕರಿಸಿ .
-Update clearance date of Journal Entries marked as 'Bank Vouchers',ಜರ್ನಲ್ ನಮೂದುಗಳನ್ನು ಅಪ್ಡೇಟ್ ತೆರವು ದಿನಾಂಕ ' ಬ್ಯಾಂಕ್ ರಶೀದಿ ' ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ
+Update clearance date of Journal Entries marked as 'Bank Entry',ಜರ್ನಲ್ ನಮೂದುಗಳನ್ನು ಅಪ್ಡೇಟ್ ತೆರವು ದಿನಾಂಕ ' ಬ್ಯಾಂಕ್ ರಶೀದಿ ' ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ
Updated,ನವೀಕರಿಸಲಾಗಿದೆ
Updated Birthday Reminders,ನವೀಕರಿಸಲಾಗಿದೆ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
Upload Attendance,ಅಟೆಂಡೆನ್ಸ್ ಅಪ್ಲೋಡ್
@@ -3234,7 +3234,7 @@
Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
Write Off Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್ ಆಫ್ ಬರೆಯಿರಿ
Write Off Outstanding Amount,ಪ್ರಮಾಣ ಅತ್ಯುತ್ತಮ ಆಫ್ ಬರೆಯಿರಿ
-Write Off Voucher,ಚೀಟಿ ಆಫ್ ಬರೆಯಿರಿ
+Write Off Entry,ಚೀಟಿ ಆಫ್ ಬರೆಯಿರಿ
Wrong Template: Unable to find head row.,ತಪ್ಪು ಟೆಂಪ್ಲೇಟು: ತಲೆ ಸಾಲು ಪತ್ತೆ ಮಾಡಲಾಗಲಿಲ್ಲ .
Year,ವರ್ಷ
Year Closed,ವರ್ಷ ಮುಚ್ಚಲಾಯಿತು
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,ನೀವು ಆದೇಶ ಈ ಐಟಂ ಕನಿಷ್ಠ ಪ್ರಮಾಣದಲ್ಲಿ ನಮೂದಿಸಬಹುದು .
You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,ನೀವು ಡೆಲಿವರಿ ಸೂಚನೆ ಯಾವುದೇ ಮತ್ತು ಯಾವುದೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಎರಡೂ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಯಾವುದೇ ಒಂದು ನಮೂದಿಸಿ.
-You can not enter current voucher in 'Against Journal Voucher' column,ನೀವು ಕಾಲಮ್ ' ಜರ್ನಲ್ ಚೀಟಿ ವಿರುದ್ಧ ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ ' ಜರ್ನಲ್ ಚೀಟಿ ವಿರುದ್ಧ ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
You can set Default Bank Account in Company master,ನೀವು ಕಂಪನಿ ಮಾಸ್ಟರ್ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ ಹೊಂದಿಸಬಹುದು
You can start by selecting backup frequency and granting access for sync,ನೀವು ಬ್ಯಾಕ್ಅಪ್ ಆವರ್ತನ ಆಯ್ಕೆ ಮತ್ತು ಸಿಂಕ್ ಪ್ರವೇಶವನ್ನು ನೀಡುವ ಮೂಲಕ ಆರಂಭಿಸಬಹುದು
You can submit this Stock Reconciliation.,ನೀವು ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಸಲ್ಲಿಸಬಹುದು .
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 9a6dc52..f3dd39a 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -152,8 +152,8 @@
Against Document No,문서 번호에 대하여
Against Expense Account,비용 계정에 대한
Against Income Account,손익 계정에 대한
-Against Journal Voucher,분개장에 대하여
-Against Journal Voucher {0} does not have any unmatched {1} entry,분개장에 대해 {0} 어떤 타의 추종을 불허 {1} 항목이없는
+Against Journal Entry,분개장에 대하여
+Against Journal Entry {0} does not have any unmatched {1} entry,분개장에 대해 {0} 어떤 타의 추종을 불허 {1} 항목이없는
Against Purchase Invoice,구매 인보이스에 대한
Against Sales Invoice,견적서에 대하여
Against Sales Order,판매 주문에 대해
@@ -335,7 +335,7 @@
Bank Reconciliation,은행 화해
Bank Reconciliation Detail,은행 화해 세부 정보
Bank Reconciliation Statement,은행 조정 계산서
-Bank Voucher,은행 바우처
+Bank Entry,은행 바우처
Bank/Cash Balance,은행 / 현금 잔액
Banking,은행
Barcode,바코드
@@ -470,7 +470,7 @@
Case No. cannot be 0,케이스 번호는 0이 될 수 없습니다
Cash,자금
Cash In Hand,손에 현금
-Cash Voucher,현금 바우처
+Cash Entry,현금 바우처
Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
Cash/Bank Account,현금 / 은행 계좌
Casual Leave,캐주얼 허가
@@ -594,7 +594,7 @@
Contacts,주소록
Content,목차
Content Type,컨텐츠 유형
-Contra Voucher,콘트라 바우처
+Contra Entry,콘트라 바우처
Contract,계약직
Contract End Date,계약 종료 날짜
Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
@@ -625,7 +625,7 @@
Country Name,국가 이름
Country wise default Address Templates,국가 현명한 기본 주소 템플릿
"Country, Timezone and Currency","국가, 시간대 통화"
-Create Bank Voucher for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 바우처를 만들기
+Create Bank Entry for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 바우처를 만들기
Create Customer,고객을 만들기
Create Material Requests,자료 요청을 만듭니다
Create New,새로 만들기
@@ -647,7 +647,7 @@
Credit,신용
Credit Amt,신용 AMT 사의
Credit Card,신용카드
-Credit Card Voucher,신용 카드 바우처
+Credit Card Entry,신용 카드 바우처
Credit Controller,신용 컨트롤러
Credit Days,신용 일
Credit Limit,신용 한도
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,소비세 의무 에듀 CESS 2
Excise Duty SHE Cess 1,소비세 의무 SHE CESS 1
Excise Page Number,소비세의 페이지 번호
-Excise Voucher,소비세 바우처
+Excise Entry,소비세 바우처
Execution,실행
Executive Search,대표 조사
Exemption Limit,면제 한도
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,송장을 반복 필수 날짜에와 송장 기간에서 송장 기간
Invoice Period To,청구서 기간
Invoice Type,송장 유형
-Invoice/Journal Voucher Details,송장 / 분개장 세부 정보
+Invoice/Journal Entry Details,송장 / 분개장 세부 정보
Invoiced Amount (Exculsive Tax),인보이스에 청구 된 금액 (Exculsive 세금)
Is Active,활성
Is Advance,사전인가
@@ -1457,11 +1457,11 @@
Jobs Email Settings,채용 정보 이메일 설정
Journal Entries,저널 항목
Journal Entry,분개
-Journal Voucher,분개장
+Journal Entry,분개장
Journal Entry Account,분개장 세부 정보
Journal Entry Account No,분개장 세부 사항 없음
-Journal Voucher {0} does not have account {1} or already matched,분개장 {0} 계정이없는 {1} 또는 이미 일치
-Journal Vouchers {0} are un-linked,분개장 {0} 않은 연결되어
+Journal Entry {0} does not have account {1} or already matched,분개장 {0} 계정이없는 {1} 또는 이미 일치
+Journal Entries {0} are un-linked,분개장 {0} 않은 연결되어
Keep a track of communication related to this enquiry which will help for future reference.,향후 참조를 위해 도움이 될 것입니다이 문의와 관련된 통신을 확인합니다.
Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
Key Performance Area,핵심 성과 지역
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,주요 / 선택 주제
Make ,Make
Make Accounting Entry For Every Stock Movement,모든 주식 이동을위한 회계 항목을 만듭니다
-Make Bank Voucher,은행 바우처에게 확인
+Make Bank Entry,은행 바우처에게 확인
Make Credit Note,신용 참고하십시오
Make Debit Note,직불 참고하십시오
Make Delivery,배달을
@@ -3096,7 +3096,7 @@
Update Series Number,업데이트 시리즈 번호
Update Stock,주식 업데이트
Update bank payment dates with journals.,저널과 은행의 지불 날짜를 업데이트합니다.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',저널 항목의 업데이트 통관 날짜는 '은행 바우처'로 표시
+Update clearance date of Journal Entries marked as 'Bank Entry',저널 항목의 업데이트 통관 날짜는 '은행 바우처'로 표시
Updated,업데이트
Updated Birthday Reminders,업데이트 생일 알림
Upload Attendance,출석 업로드
@@ -3234,7 +3234,7 @@
Write Off Based On,에 의거 오프 쓰기
Write Off Cost Center,비용 센터를 오프 쓰기
Write Off Outstanding Amount,잔액을 떨어져 쓰기
-Write Off Voucher,바우처 오프 쓰기
+Write Off Entry,바우처 오프 쓰기
Wrong Template: Unable to find head row.,잘못된 템플릿 : 머리 행을 찾을 수 없습니다.
Year,년
Year Closed,연도 폐쇄
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,당신은 주문이 항목의 최소 수량을 입력 할 수 있습니다.
You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,당신은 아니오 모두 배달 주를 입력 할 수 없습니다 및 판매 송장 번호는 하나를 입력하십시오.
-You can not enter current voucher in 'Against Journal Voucher' column,당신은 열 '분개장에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
+You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '분개장에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
You can set Default Bank Account in Company master,당신은 회사 마스터의 기본 은행 계좌를 설정할 수 있습니다
You can start by selecting backup frequency and granting access for sync,당신은 백업 빈도를 선택하고 동기화에 대한 액세스를 부여하여 시작할 수 있습니다
You can submit this Stock Reconciliation.,당신이 재고 조정을 제출할 수 있습니다.
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index aed452e..235b8c9 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -152,8 +152,8 @@
Against Document No,Tegen document nr.
Against Expense Account,Tegen Expense Account
Against Income Account,Tegen Inkomen account
-Against Journal Voucher,Tegen Journal Voucher
-Against Journal Voucher {0} does not have any unmatched {1} entry,Tegen Journal Voucher {0} heeft geen ongeëvenaarde {1} toegang hebben
+Against Journal Entry,Tegen Journal Entry
+Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} toegang hebben
Against Purchase Invoice,Tegen Aankoop Factuur
Against Sales Invoice,Tegen Sales Invoice
Against Sales Order,Tegen klantorder
@@ -335,7 +335,7 @@
Bank Reconciliation,Bank Verzoening
Bank Reconciliation Detail,Bank Verzoening Detail
Bank Reconciliation Statement,Bank Verzoening Statement
-Bank Voucher,Bank Voucher
+Bank Entry,Bank Entry
Bank/Cash Balance,Bank / Geldsaldo
Banking,bank
Barcode,Barcode
@@ -470,7 +470,7 @@
Case No. cannot be 0,Zaak nr. mag geen 0
Cash,Geld
Cash In Hand,Cash In Hand
-Cash Voucher,Cash Voucher
+Cash Entry,Cash Entry
Cash or Bank Account is mandatory for making payment entry,Cash of bankrekening is verplicht voor de betaling toegang
Cash/Bank Account,Cash / bankrekening
Casual Leave,Casual Leave
@@ -594,7 +594,7 @@
Contacts,contacten
Content,Inhoud
Content Type,Content Type
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,contract
Contract End Date,Contract Einddatum
Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan Datum van Deelnemen zijn
@@ -625,7 +625,7 @@
Country Name,Naam van het land
Country wise default Address Templates,Land verstandig default Adres Templates
"Country, Timezone and Currency","Country , Tijdzone en Valuta"
-Create Bank Voucher for the total salary paid for the above selected criteria,Maak Bank Voucher voor het totale loon voor de bovenstaande geselecteerde criteria
+Create Bank Entry for the total salary paid for the above selected criteria,Maak Bank Entry voor het totale loon voor de bovenstaande geselecteerde criteria
Create Customer,Maak de klant
Create Material Requests,Maak Materiaal Aanvragen
Create New,Create New
@@ -647,7 +647,7 @@
Credit,Krediet
Credit Amt,Credit Amt
Credit Card,creditkaart
-Credit Card Voucher,Credit Card Voucher
+Credit Card Entry,Credit Card Entry
Credit Controller,Credit Controller
Credit Days,Credit Dagen
Credit Limit,Kredietlimiet
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Accijns Edu Cess 2
Excise Duty SHE Cess 1,Accijns SHE Cess 1
Excise Page Number,Accijnzen Paginanummer
-Excise Voucher,Accijnzen Voucher
+Excise Entry,Accijnzen Voucher
Execution,uitvoering
Executive Search,Executive Search
Exemption Limit,Vrijstelling Limit
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Factuur Periode Van en Factuur periode data verplicht voor terugkerende factuur
Invoice Period To,Factuur periode
Invoice Type,Factuur Type
-Invoice/Journal Voucher Details,Factuur / Journal Voucher Details
+Invoice/Journal Entry Details,Factuur / Journal Entry Details
Invoiced Amount (Exculsive Tax),Factuurbedrag ( Exculsive BTW )
Is Active,Is actief
Is Advance,Is Advance
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Vacatures E-mailinstellingen
Journal Entries,Journaalposten
Journal Entry,Journal Entry
-Journal Voucher,Journal Voucher
+Journal Entry,Journal Entry
Journal Entry Account,Journal Entry Account
Journal Entry Account No,Journal Entry Account Geen
-Journal Voucher {0} does not have account {1} or already matched,Journal Voucher {0} heeft geen rekening {1} of al geëvenaard
-Journal Vouchers {0} are un-linked,Dagboek Vouchers {0} zijn niet- verbonden
+Journal Entry {0} does not have account {1} or already matched,Journal Entry {0} heeft geen rekening {1} of al geëvenaard
+Journal Entries {0} are un-linked,Dagboek Vouchers {0} zijn niet- verbonden
Keep a track of communication related to this enquiry which will help for future reference.,Houd een spoor van communicatie met betrekking tot dit onderzoek dat zal helpen voor toekomstig gebruik.
Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px ( w ) door 100px ( h )
Key Performance Area,Key Performance Area
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Major / keuzevakken
Make ,Make
Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
-Make Bank Voucher,Maak Bank Voucher
+Make Bank Entry,Maak Bank Entry
Make Credit Note,Maak Credit Note
Make Debit Note,Maak debetnota
Make Delivery,Maak Levering
@@ -3096,7 +3096,7 @@
Update Series Number,Update Serie Nummer
Update Stock,Werk Stock
Update bank payment dates with journals.,Update bank betaaldata met tijdschriften.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Goedkeuring datum actualisering van Journaalposten gemarkeerd als ' Bank Vouchers '
+Update clearance date of Journal Entries marked as 'Bank Entry',Goedkeuring datum actualisering van Journaalposten gemarkeerd als ' Bank Entry '
Updated,Bijgewerkt
Updated Birthday Reminders,Bijgewerkt verjaardagsherinneringen
Upload Attendance,Upload Toeschouwers
@@ -3234,7 +3234,7 @@
Write Off Based On,Schrijf Uit Based On
Write Off Cost Center,Schrijf Uit kostenplaats
Write Off Outstanding Amount,Schrijf uitstaande bedrag
-Write Off Voucher,Schrijf Uit Voucher
+Write Off Entry,Schrijf Uit Voucher
Wrong Template: Unable to find head row.,Verkeerde Template: Kan hoofd rij vinden.
Year,Jaar
Year Closed,Jaar Gesloten
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,U kunt de minimale hoeveelheid van dit product te bestellen.
You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Je kunt niet Geen Voer beide Delivery Note en verkoopfactuur Nee Geef iemand.
-You can not enter current voucher in 'Against Journal Voucher' column,Je kan niet in de huidige voucher in ' Against Journal Voucher ' kolom
+You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in ' Against Journal Entry ' kolom
You can set Default Bank Account in Company master,U kunt Default Bank Account ingesteld in Bedrijf meester
You can start by selecting backup frequency and granting access for sync,U kunt beginnen met back- frequentie te selecteren en het verlenen van toegang voor synchronisatie
You can submit this Stock Reconciliation.,U kunt indienen dit Stock Verzoening .
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 0e95610..dc393bf 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -145,8 +145,8 @@
Against Entries,Against Entries
Against Expense Account,Against Expense Account
Against Income Account,Against Income Account
-Against Journal Voucher,Against Journal Voucher
-Against Journal Voucher {0} does not have any unmatched {1} entry,Against Journal Voucher {0} does not have any unmatched {1} entry
+Against Journal Entry,Against Journal Entry
+Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry
Against Purchase Invoice,Against Purchase Invoice
Against Sales Invoice,Against Sales Invoice
Against Sales Order,Against Sales Order
@@ -328,7 +328,7 @@
Bank Reconciliation,Bank Reconciliation
Bank Reconciliation Detail,Bank Reconciliation Detail
Bank Reconciliation Statement,Bank Reconciliation Statement
-Bank Voucher,Bank Voucher
+Bank Entry,Bank Entry
Bank/Cash Balance,Bank/Cash Balance
Banking,Banking
Barcode,Kod kreskowy
@@ -457,7 +457,7 @@
Case No. cannot be 0,Case No. cannot be 0
Cash,Gotówka
Cash In Hand,Cash In Hand
-Cash Voucher,Cash Voucher
+Cash Entry,Cash Entry
Cash or Bank Account is mandatory for making payment entry,Cash or Bank Account is mandatory for making payment entry
Cash/Bank Account,Cash/Bank Account
Casual Leave,Casual Leave
@@ -577,7 +577,7 @@
Contacts,Kontakty
Content,Zawartość
Content Type,Content Type
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,Kontrakt
Contract End Date,Contract End Date
Contract End Date must be greater than Date of Joining,Contract End Date must be greater than Date of Joining
@@ -608,7 +608,7 @@
Country,Kraj
Country Name,Nazwa kraju
"Country, Timezone and Currency","Country, Timezone and Currency"
-Create Bank Voucher for the total salary paid for the above selected criteria,Create Bank Voucher for the total salary paid for the above selected criteria
+Create Bank Entry for the total salary paid for the above selected criteria,Create Bank Entry for the total salary paid for the above selected criteria
Create Customer,Create Customer
Create Material Requests,Create Material Requests
Create New,Create New
@@ -630,7 +630,7 @@
Credit,Credit
Credit Amt,Credit Amt
Credit Card,Credit Card
-Credit Card Voucher,Credit Card Voucher
+Credit Card Entry,Credit Card Entry
Credit Controller,Credit Controller
Credit Days,Credit Days
Credit Limit,Credit Limit
@@ -944,7 +944,7 @@
"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.","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."
Exchange Rate,Exchange Rate
Excise Page Number,Excise Page Number
-Excise Voucher,Excise Voucher
+Excise Entry,Excise Entry
Execution,Execution
Executive Search,Executive Search
Exemption Limit,Exemption Limit
@@ -1401,11 +1401,11 @@
Jobs Email Settings,Jobs Email Settings
Journal Entries,Journal Entries
Journal Entry,Journal Entry
-Journal Voucher,Journal Voucher
+Journal Entry,Journal Entry
Journal Entry Account,Journal Entry Account
Journal Entry Account No,Journal Entry Account No
-Journal Voucher {0} does not have account {1} or already matched,Journal Voucher {0} does not have account {1} or already matched
-Journal Vouchers {0} are un-linked,Journal Vouchers {0} are un-linked
+Journal Entry {0} does not have account {1} or already matched,Journal Entry {0} does not have account {1} or already matched
+Journal Entries {0} are un-linked,Journal Entries {0} are un-linked
Keep a track of communication related to this enquiry which will help for future reference.,Keep a track of communication related to this enquiry which will help for future reference.
Keep it web friendly 900px (w) by 100px (h),Keep it web friendly 900px (w) by 100px (h)
Key Performance Area,Key Performance Area
@@ -1519,7 +1519,7 @@
Major/Optional Subjects,Major/Optional Subjects
Make ,Stwórz
Make Accounting Entry For Every Stock Movement,Make Accounting Entry For Every Stock Movement
-Make Bank Voucher,Make Bank Voucher
+Make Bank Entry,Make Bank Entry
Make Credit Note,Make Credit Note
Make Debit Note,Make Debit Note
Make Delivery,Make Delivery
@@ -2982,7 +2982,7 @@
Update Stock,Update Stock
"Update allocated amount in the above table and then click ""Allocate"" button","Update allocated amount in the above table and then click ""Allocate"" button"
Update bank payment dates with journals.,Update bank payment dates with journals.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Update clearance date of Journal Entries marked as 'Bank Vouchers'
+Update clearance date of Journal Entries marked as 'Bank Entry',Update clearance date of Journal Entries marked as 'Bank Entry'
Updated,Updated
Updated Birthday Reminders,Updated Birthday Reminders
Upload Attendance,Upload Attendance
@@ -3117,7 +3117,7 @@
Write Off Based On,Write Off Based On
Write Off Cost Center,Write Off Cost Center
Write Off Outstanding Amount,Write Off Outstanding Amount
-Write Off Voucher,Write Off Voucher
+Write Off Entry,Write Off Entry
Wrong Template: Unable to find head row.,Wrong Template: Unable to find head row.
Year,Rok
Year Closed,Year Closed
@@ -3139,7 +3139,7 @@
You can not assign itself as parent account,You can not assign itself as parent account
You can not change rate if BOM mentioned agianst any item,You can not change rate if BOM mentioned agianst any item
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.
-You can not enter current voucher in 'Against Journal Voucher' column,You can not enter current voucher in 'Against Journal Voucher' column
+You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
You can set Default Bank Account in Company master,You can set Default Bank Account in Company master
You can start by selecting backup frequency and granting access for sync,You can start by selecting backup frequency and granting access for sync
You can submit this Stock Reconciliation.,You can submit this Stock Reconciliation.
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index b6c64db..88de6fb 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -178,8 +178,8 @@
Against Document No,Contra Documento nº
Against Expense Account,Contra a Conta de Despesas
Against Income Account,Contra a Conta de Rendimentos
-Against Journal Voucher,Contra Comprovante do livro Diário
-Against Journal Voucher {0} does not have any unmatched {1} entry,Contra Jornal Vale {0} não tem {1} entrada incomparável
+Against Journal Entry,Contra Comprovante do livro Diário
+Against Journal Entry {0} does not have any unmatched {1} entry,Contra Jornal Vale {0} não tem {1} entrada incomparável
Against Purchase Invoice,Contra a Nota Fiscal de Compra
Against Sales Invoice,Contra a Nota Fiscal de Venda
Against Sales Order,Contra Ordem de Vendas
@@ -361,7 +361,7 @@
Bank Reconciliation,Reconciliação Bancária
Bank Reconciliation Detail,Detalhe da Reconciliação Bancária
Bank Reconciliation Statement,Declaração de reconciliação bancária
-Bank Voucher,Comprovante Bancário
+Bank Entry,Comprovante Bancário
Bank/Cash Balance,Banco / Saldo de Caixa
Banking,bancário
Barcode,Código de barras
@@ -496,7 +496,7 @@
Case No. cannot be 0,Caso n não pode ser 0
Cash,Numerário
Cash In Hand,Dinheiro na mão
-Cash Voucher,Comprovante de Caixa
+Cash Entry,Comprovante de Caixa
Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
Cash/Bank Account,Conta do Caixa/Banco
Casual Leave,Casual Deixar
@@ -620,7 +620,7 @@
Contacts,Contactos
Content,Conteúdo
Content Type,Tipo de Conteúdo
-Contra Voucher,Comprovante de Caixa
+Contra Entry,Comprovante de Caixa
Contract,contrato
Contract End Date,Data Final do contrato
Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
@@ -651,7 +651,7 @@
Country Name,Nome do País
Country wise default Address Templates,Modelos País default sábio endereço
"Country, Timezone and Currency","País , o fuso horário e moeda"
-Create Bank Voucher for the total salary paid for the above selected criteria,Criar Comprovante Bancário para o salário total pago para os critérios acima selecionados
+Create Bank Entry for the total salary paid for the above selected criteria,Criar Comprovante Bancário para o salário total pago para os critérios acima selecionados
Create Customer,criar Cliente
Create Material Requests,Criar Pedidos de Materiais
Create New,criar Novo
@@ -673,7 +673,7 @@
Credit,Crédito
Credit Amt,Montante de Crédito
Credit Card,cartão de crédito
-Credit Card Voucher,Comprovante do cartão de crédito
+Credit Card Entry,Comprovante do cartão de crédito
Credit Controller,Controlador de crédito
Credit Days,Dias de Crédito
Credit Limit,Limite de Crédito
@@ -1009,7 +1009,7 @@
Excise Duty Edu Cess 2,Impostos Especiais de Consumo Edu Cess 2
Excise Duty SHE Cess 1,Impostos Especiais de Consumo SHE Cess 1
Excise Page Number,Número de página do imposto
-Excise Voucher,Comprovante do imposto
+Excise Entry,Comprovante do imposto
Execution,execução
Executive Search,Executive Search
Exemption Limit,Limite de isenção
@@ -1357,7 +1357,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Fatura Período De e Período fatura para datas obrigatórias para fatura recorrentes
Invoice Period To,Período fatura para
Invoice Type,Tipo de Fatura
-Invoice/Journal Voucher Details,Factura / Jornal Vale detalhes
+Invoice/Journal Entry Details,Factura / Jornal Vale detalhes
Invoiced Amount (Exculsive Tax),Valor faturado ( Exculsive Tributário)
Is Active,É Ativo
Is Advance,É antecipado
@@ -1489,11 +1489,11 @@
Jobs Email Settings,Configurações do e-mail de empregos
Journal Entries,Lançamentos do livro Diário
Journal Entry,Lançamento do livro Diário
-Journal Voucher,Comprovante do livro Diário
+Journal Entry,Comprovante do livro Diário
Journal Entry Account,Detalhe do Comprovante do livro Diário
Journal Entry Account No,Nº do Detalhe do Comprovante do livro Diário
-Journal Voucher {0} does not have account {1} or already matched,Jornal Vale {0} não tem conta {1} ou já combinava
-Journal Vouchers {0} are un-linked,Jornal Vouchers {0} são não- ligado
+Journal Entry {0} does not have account {1} or already matched,Jornal Vale {0} não tem conta {1} ou já combinava
+Journal Entries {0} are un-linked,Jornal Vouchers {0} são não- ligado
Keep a track of communication related to this enquiry which will help for future reference.,"Mantenha o controle de comunicações relacionadas a esta consulta, o que irá ajudar para futuras referências."
Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
Key Performance Area,Área Chave de Performance
@@ -1608,7 +1608,7 @@
Major/Optional Subjects,Assuntos Principais / Opcionais
Make ,
Make Accounting Entry For Every Stock Movement,Faça Contabilidade entrada para cada Banco de Movimento
-Make Bank Voucher,Fazer Comprovante Bancário
+Make Bank Entry,Fazer Comprovante Bancário
Make Credit Note,Faça Nota de Crédito
Make Debit Note,Faça Nota de Débito
Make Delivery,Faça Entrega
@@ -3144,7 +3144,7 @@
Update Series Number,Atualizar Números de Séries
Update Stock,Atualizar Estoque
Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Data de apuramento Atualização de entradas de diário marcado como ' Banco ' Vouchers
+Update clearance date of Journal Entries marked as 'Bank Entry',Data de apuramento Atualização de entradas de diário marcado como ' Banco ' Vouchers
Updated,Atualizado
Updated Birthday Reminders,Atualizado Aniversário Lembretes
Upload Attendance,Envie Atendimento
@@ -3282,7 +3282,7 @@
Write Off Based On,Eliminar Baseado em
Write Off Cost Center,Eliminar Centro de Custos
Write Off Outstanding Amount,Eliminar saldo devedor
-Write Off Voucher,Eliminar comprovante
+Write Off Entry,Eliminar comprovante
Wrong Template: Unable to find head row.,Template errado: Não é possível encontrar linha cabeça.
Year,Ano
Year Closed,Ano Encerrado
@@ -3300,7 +3300,7 @@
You can enter the minimum quantity of this item to be ordered.,Você pode inserir a quantidade mínima deste item a ser encomendada.
You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa de se BOM mencionado agianst qualquer item
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Você não pode entrar tanto de entrega Nota Não e Vendas fatura Não. Por favor entrar em qualquer um.
-You can not enter current voucher in 'Against Journal Voucher' column,Você não pode entrar comprovante atual em ' Contra Jornal Vale ' coluna
+You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em ' Contra Jornal Vale ' coluna
You can set Default Bank Account in Company master,Você pode definir padrão Conta Bancária no mestre Empresa
You can start by selecting backup frequency and granting access for sync,Você pode começar por selecionar a freqüência de backup e concessão de acesso para sincronização
You can submit this Stock Reconciliation.,Você pode enviar este Stock Reconciliação.
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 501d476..632c659 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -152,8 +152,8 @@
Against Document No,Contra documento No
Against Expense Account,Contra a conta de despesas
Against Income Account,Contra Conta a Receber
-Against Journal Voucher,Contra Vale Jornal
-Against Journal Voucher {0} does not have any unmatched {1} entry,Contra Jornal Vale {0} não tem {1} entrada incomparável
+Against Journal Entry,Contra Vale Jornal
+Against Journal Entry {0} does not have any unmatched {1} entry,Contra Jornal Vale {0} não tem {1} entrada incomparável
Against Purchase Invoice,Contra a Nota Fiscal de Compra
Against Sales Invoice,Contra a nota fiscal de venda
Against Sales Order,Contra Ordem de Venda
@@ -335,7 +335,7 @@
Bank Reconciliation,Banco Reconciliação
Bank Reconciliation Detail,Banco Detalhe Reconciliação
Bank Reconciliation Statement,Declaração de reconciliação bancária
-Bank Voucher,Vale banco
+Bank Entry,Vale banco
Bank/Cash Balance,Banco / Saldo de Caixa
Banking,bancário
Barcode,Código de barras
@@ -470,7 +470,7 @@
Case No. cannot be 0,Zaak nr. mag geen 0
Cash,Numerário
Cash In Hand,Dinheiro na mão
-Cash Voucher,Comprovante de dinheiro
+Cash Entry,Comprovante de dinheiro
Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
Cash/Bank Account,Caixa / Banco Conta
Casual Leave,Casual Deixar
@@ -594,7 +594,7 @@
Contacts,Contactos
Content,Conteúdo
Content Type,Tipo de conteúdo
-Contra Voucher,Vale Contra
+Contra Entry,Vale Contra
Contract,contrato
Contract End Date,Data final do contrato
Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
@@ -625,7 +625,7 @@
Country Name,Nome do País
Country wise default Address Templates,Modelos País default sábio endereço
"Country, Timezone and Currency","Country , Tijdzone en Valuta"
-Create Bank Voucher for the total salary paid for the above selected criteria,Criar Vale do Banco Mundial para o salário total pago para os critérios acima selecionados
+Create Bank Entry for the total salary paid for the above selected criteria,Criar Vale do Banco Mundial para o salário total pago para os critérios acima selecionados
Create Customer,Maak de klant
Create Material Requests,Criar Pedidos de Materiais
Create New,Create New
@@ -647,7 +647,7 @@
Credit,Crédito
Credit Amt,Crédito Amt
Credit Card,cartão de crédito
-Credit Card Voucher,Comprovante do cartão de crédito
+Credit Card Entry,Comprovante do cartão de crédito
Credit Controller,Controlador de crédito
Credit Days,Dias de crédito
Credit Limit,Limite de Crédito
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Impostos Especiais de Consumo Edu Cess 2
Excise Duty SHE Cess 1,Impostos Especiais de Consumo SHE Cess 1
Excise Page Number,Número de página especial sobre o consumo
-Excise Voucher,Vale especiais de consumo
+Excise Entry,Vale especiais de consumo
Execution,execução
Executive Search,Executive Search
Exemption Limit,Limite de isenção
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Fatura Período De e Período fatura para datas obrigatórias para fatura recorrentes
Invoice Period To,Período fatura para
Invoice Type,Tipo de Fatura
-Invoice/Journal Voucher Details,Factura / Jornal Vale detalhes
+Invoice/Journal Entry Details,Factura / Jornal Vale detalhes
Invoiced Amount (Exculsive Tax),Factuurbedrag ( Exculsive BTW )
Is Active,É Ativo
Is Advance,É o avanço
@@ -1457,11 +1457,11 @@
Jobs Email Settings,E-mail Configurações de empregos
Journal Entries,Jornal entradas
Journal Entry,Journal Entry
-Journal Voucher,Vale Jornal
+Journal Entry,Vale Jornal
Journal Entry Account,Jornal Detalhe Vale
Journal Entry Account No,Jornal Detalhe folha no
-Journal Voucher {0} does not have account {1} or already matched,Jornal Vale {0} não tem conta {1} ou já combinava
-Journal Vouchers {0} are un-linked,Jornal Vouchers {0} são não- ligado
+Journal Entry {0} does not have account {1} or already matched,Jornal Vale {0} não tem conta {1} ou já combinava
+Journal Entries {0} are un-linked,Jornal Vouchers {0} são não- ligado
Keep a track of communication related to this enquiry which will help for future reference.,Mantenha uma faixa de comunicação relacionada a este inquérito que irá ajudar para referência futura.
Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
Key Performance Area,Área Key Performance
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Assuntos Principais / Opcional
Make ,Make
Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
-Make Bank Voucher,Faça Vale Banco
+Make Bank Entry,Faça Vale Banco
Make Credit Note,Maak Credit Note
Make Debit Note,Maak debetnota
Make Delivery,Maak Levering
@@ -3096,7 +3096,7 @@
Update Series Number,Atualização de Número de Série
Update Stock,Actualização de stock
Update bank payment dates with journals.,Atualização de pagamento bancário com data revistas.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Goedkeuring datum actualisering van Journaalposten gemarkeerd als ' Bank Vouchers '
+Update clearance date of Journal Entries marked as 'Bank Entry',Goedkeuring datum actualisering van Journaalposten gemarkeerd als ' Bank Entry '
Updated,Atualizado
Updated Birthday Reminders,Bijgewerkt verjaardagsherinneringen
Upload Attendance,Envie Atendimento
@@ -3234,7 +3234,7 @@
Write Off Based On,Escreva Off Baseado em
Write Off Cost Center,Escreva Off Centro de Custos
Write Off Outstanding Amount,Escreva Off montante em dívida
-Write Off Voucher,Escreva voucher
+Write Off Entry,Escreva voucher
Wrong Template: Unable to find head row.,Template errado: Não é possível encontrar linha cabeça.
Year,Ano
Year Closed,Ano Encerrado
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Você pode inserir a quantidade mínima deste item a ser ordenada.
You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Je kunt niet Geen Voer beide Delivery Note en verkoopfactuur Nee Geef iemand.
-You can not enter current voucher in 'Against Journal Voucher' column,Você não pode entrar comprovante atual em ' Contra Jornal Vale ' coluna
+You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em ' Contra Jornal Vale ' coluna
You can set Default Bank Account in Company master,Você pode definir padrão Conta Bancária no mestre Empresa
You can start by selecting backup frequency and granting access for sync,Você pode começar por selecionar a freqüência de backup e concessão de acesso para sincronização
You can submit this Stock Reconciliation.,U kunt indienen dit Stock Verzoening .
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index d3e2b7b..fc22e1d 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -152,8 +152,8 @@
Against Document No,Împotriva Documentul nr
Against Expense Account,Împotriva cont de cheltuieli
Against Income Account,Împotriva contul de venit
-Against Journal Voucher,Împotriva Jurnalul Voucher
-Against Journal Voucher {0} does not have any unmatched {1} entry,Împotriva Jurnalul Voucher {0} nu are nici neegalat {1} intrare
+Against Journal Entry,Împotriva Jurnalul Voucher
+Against Journal Entry {0} does not have any unmatched {1} entry,Împotriva Jurnalul Voucher {0} nu are nici neegalat {1} intrare
Against Purchase Invoice,Împotriva cumparare factură
Against Sales Invoice,Împotriva Factura Vanzare
Against Sales Order,Împotriva comandă de vânzări
@@ -335,7 +335,7 @@
Bank Reconciliation,Banca Reconciliere
Bank Reconciliation Detail,Banca Reconcilierea Detaliu
Bank Reconciliation Statement,Extras de cont de reconciliere
-Bank Voucher,Bancă Voucher
+Bank Entry,Bancă Voucher
Bank/Cash Balance,Bank / Cash Balance
Banking,Bancar
Barcode,Cod de bare
@@ -470,7 +470,7 @@
Case No. cannot be 0,"Caz Nu, nu poate fi 0"
Cash,Numerar
Cash In Hand,Bani în mână
-Cash Voucher,Cash Voucher
+Cash Entry,Cash Entry
Cash or Bank Account is mandatory for making payment entry,Numerar sau cont bancar este obligatorie pentru a face intrarea plată
Cash/Bank Account,Contul Cash / Banca
Casual Leave,Casual concediu
@@ -594,7 +594,7 @@
Contacts,Contacte
Content,Continut
Content Type,Tip de conținut
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,Contractarea
Contract End Date,Contract Data de încheiere
Contract End Date must be greater than Date of Joining,Contract Data de sfârșit trebuie să fie mai mare decât Data aderării
@@ -625,7 +625,7 @@
Country Name,Nume țară
Country wise default Address Templates,Șabloanele țară înțelept adresa implicită
"Country, Timezone and Currency","Țară, Timezone și valutar"
-Create Bank Voucher for the total salary paid for the above selected criteria,Crea Bank Voucher pentru salariul totală plătită pentru criteriile selectate de mai sus
+Create Bank Entry for the total salary paid for the above selected criteria,Crea Bank Entry pentru salariul totală plătită pentru criteriile selectate de mai sus
Create Customer,Creare client
Create Material Requests,Cererile crea materiale
Create New,Crearea de noi
@@ -647,7 +647,7 @@
Credit,credit
Credit Amt,Credit Amt
Credit Card,Card de credit
-Credit Card Voucher,Card de credit Voucher
+Credit Card Entry,Card de credit Voucher
Credit Controller,Controler de credit
Credit Days,Zile de credit
Credit Limit,Limita de credit
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Accizele Edu Cess 2
Excise Duty SHE Cess 1,Accizele SHE Cess 1
Excise Page Number,Numărul de accize Page
-Excise Voucher,Accize Voucher
+Excise Entry,Accize Voucher
Execution,Detalii de fabricaţie
Executive Search,Executive Search
Exemption Limit,Limita de scutire
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Perioada factura la și facturilor perioadă la date obligatorii pentru facturi recurente
Invoice Period To,Perioada de facturare a
Invoice Type,Factura Tip
-Invoice/Journal Voucher Details,Factura / Jurnalul Voucher Detalii
+Invoice/Journal Entry Details,Factura / Jurnalul Voucher Detalii
Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
Is Active,Este activ
Is Advance,Este Advance
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Setări de locuri de muncă de e-mail
Journal Entries,Intrari in jurnal
Journal Entry,Jurnal de intrare
-Journal Voucher,Jurnalul Voucher
+Journal Entry,Jurnalul Voucher
Journal Entry Account,Jurnalul Voucher Detaliu
Journal Entry Account No,Jurnalul Voucher Detaliu Nu
-Journal Voucher {0} does not have account {1} or already matched,Jurnalul Voucher {0} nu are cont {1} sau deja potrivire
-Journal Vouchers {0} are un-linked,Jurnalul Tichete {0} sunt ne-legate de
+Journal Entry {0} does not have account {1} or already matched,Jurnalul Voucher {0} nu are cont {1} sau deja potrivire
+Journal Entries {0} are un-linked,Jurnalul Tichete {0} sunt ne-legate de
Keep a track of communication related to this enquiry which will help for future reference.,"Păstra o pistă de comunicare legate de această anchetă, care va ajuta de referință pentru viitor."
Keep it web friendly 900px (w) by 100px (h),Păstrați-l web 900px prietenos (w) de 100px (h)
Key Performance Area,Domeniul Major de performanță
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Subiectele majore / opționale
Make ,Make
Make Accounting Entry For Every Stock Movement,Asigurați-vă de contabilitate de intrare pentru fiecare Stock Mișcarea
-Make Bank Voucher,Banca face Voucher
+Make Bank Entry,Banca face Voucher
Make Credit Note,Face Credit Nota
Make Debit Note,Face notă de debit
Make Delivery,Face de livrare
@@ -3096,7 +3096,7 @@
Update Series Number,Actualizare Serii Număr
Update Stock,Actualizați Stock
Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',"Data de clearance-ul de actualizare de jurnal intrările marcate ca ""Tichete Bank"""
+Update clearance date of Journal Entries marked as 'Bank Entry',"Data de clearance-ul de actualizare de jurnal intrările marcate ca ""Tichete Bank"""
Updated,Actualizat
Updated Birthday Reminders,Actualizat Data nasterii Memento
Upload Attendance,Încărcați Spectatori
@@ -3234,7 +3234,7 @@
Write Off Based On,Scrie Off bazat pe
Write Off Cost Center,Scrie Off cost Center
Write Off Outstanding Amount,Scrie Off remarcabile Suma
-Write Off Voucher,Scrie Off Voucher
+Write Off Entry,Scrie Off Voucher
Wrong Template: Unable to find head row.,Format greșit: Imposibil de găsit rând cap.
Year,An
Year Closed,An Închis
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Puteți introduce cantitatea minimă de acest element pentru a fi comandat.
You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Nu puteți introduce atât de livrare Notă Nu și Factura Vanzare Nr Vă rugăm să introduceți nici una.
-You can not enter current voucher in 'Against Journal Voucher' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul Voucher"" coloana"
+You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul Voucher"" coloana"
You can set Default Bank Account in Company master,Puteți seta implicit cont bancar în maestru de companie
You can start by selecting backup frequency and granting access for sync,Puteți începe prin selectarea frecvenței de backup și acordarea de acces pentru sincronizare
You can submit this Stock Reconciliation.,Puteți trimite această Bursa de reconciliere.
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 91102d2..3498897 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -153,8 +153,8 @@
Against Document No,Против Документ №
Against Expense Account,Против Expense Счет
Against Income Account,Против ДОХОДОВ
-Against Journal Voucher,Против Journal ваучером
-Against Journal Voucher {0} does not have any unmatched {1} entry,Против Journal ваучером {0} не имеет непревзойденную {1} запись
+Against Journal Entry,Против Journal ваучером
+Against Journal Entry {0} does not have any unmatched {1} entry,Против Journal ваучером {0} не имеет непревзойденную {1} запись
Against Purchase Invoice,Против счете-фактуре
Against Sales Invoice,Против продаж счета-фактуры
Against Sales Order,Против заказ клиента
@@ -336,7 +336,7 @@
Bank Reconciliation,Банк примирения
Bank Reconciliation Detail,Банк примирения Подробно
Bank Reconciliation Statement,Заявление Банк примирения
-Bank Voucher,Банк Ваучер
+Bank Entry,Банк Ваучер
Bank/Cash Balance,Банк / Баланс счета
Banking,Банковское дело
Barcode,Штрихкод
@@ -471,7 +471,7 @@
Case No. cannot be 0,Дело № не может быть 0
Cash,Наличные
Cash In Hand,Наличность кассы
-Cash Voucher,Кассовый чек
+Cash Entry,Кассовый чек
Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
Cash/Bank Account, Наличные / Банковский счет
Casual Leave,Повседневная Оставить
@@ -595,7 +595,7 @@
Contacts,Контакты
Content,Содержимое
Content Type,Тип контента
-Contra Voucher,Contra Ваучер
+Contra Entry,Contra Ваучер
Contract,Контракт
Contract End Date,Конец контракта Дата
Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
@@ -626,7 +626,7 @@
Country Name,Название страны
Country wise default Address Templates,Шаблоны Страна мудрый адрес по умолчанию
"Country, Timezone and Currency","Страна, Временной пояс и валют"
-Create Bank Voucher for the total salary paid for the above selected criteria,Создание банка Ваучер на общую зарплату заплатили за вышеуказанных выбранным критериям
+Create Bank Entry for the total salary paid for the above selected criteria,Создание банка Ваучер на общую зарплату заплатили за вышеуказанных выбранным критериям
Create Customer,Создание клиентов
Create Material Requests,Создать запросы Материал
Create New,Создать новый
@@ -648,7 +648,7 @@
Credit,Кредит
Credit Amt,Кредитная Amt
Credit Card,Кредитная карта
-Credit Card Voucher,Ваучер Кредитная карта
+Credit Card Entry,Ваучер Кредитная карта
Credit Controller,Кредитная контроллер
Credit Days,Кредитные дней
Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
@@ -980,7 +980,7 @@
Excise Duty Edu Cess 2,Акцизе Эду Цесс 2
Excise Duty SHE Cess 1,Акцизе ОНА Цесс 1
Excise Page Number,Количество Акцизный Страница
-Excise Voucher,Акцизный Ваучер
+Excise Entry,Акцизный Ваучер
Execution,Реализация
Executive Search,Executive Search
Exemption Limit,Освобождение Предел
@@ -1328,7 +1328,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Счет Период С и счет-фактура Период до даты обязательных для повторяющихся счет
Invoice Period To,Счет Период до
Invoice Type,Тип счета
-Invoice/Journal Voucher Details,Счет / Журнал Подробности Ваучер
+Invoice/Journal Entry Details,Счет / Журнал Подробности Ваучер
Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
Is Active,Активен
Is Advance,Является Advance
@@ -1458,11 +1458,11 @@
Jobs Email Settings,Настройки Вакансии Email
Journal Entries,Записи в журнале
Journal Entry,Запись в дневнике
-Journal Voucher,Журнал Ваучер
+Journal Entry,Журнал Ваучер
Journal Entry Account,Журнал Ваучер Подробно
Journal Entry Account No,Журнал Ваучер Подробно Нет
-Journal Voucher {0} does not have account {1} or already matched,Журнал Ваучер {0} не имеет учетной записи {1} или уже согласованы
-Journal Vouchers {0} are un-linked,Журнал Ваучеры {0} являются не-связаны
+Journal Entry {0} does not have account {1} or already matched,Журнал Ваучер {0} не имеет учетной записи {1} или уже согласованы
+Journal Entries {0} are un-linked,Журнал Ваучеры {0} являются не-связаны
Keep a track of communication related to this enquiry which will help for future reference.,"Постоянно отслеживать коммуникации, связанные на этот запрос, который поможет в будущем."
Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
Key Performance Area,Ключ Площадь Производительность
@@ -1577,7 +1577,7 @@
Major/Optional Subjects,Основные / факультативных предметов
Make ,Создать
Make Accounting Entry For Every Stock Movement,Сделать учета запись для каждого фондовой Движения
-Make Bank Voucher,Сделать банк ваучер
+Make Bank Entry,Сделать банк ваучер
Make Credit Note,Сделать кредит-нота
Make Debit Note,Сделать Debit Примечание
Make Delivery,Произвести поставку
@@ -3098,7 +3098,7 @@
Update Series Number,Обновление Номер серии
Update Stock,Обновление стока
Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',"Дата обновления оформление Записей в журнале отмечается как «Банк Ваучеры"""
+Update clearance date of Journal Entries marked as 'Bank Entry',"Дата обновления оформление Записей в журнале отмечается как «Банк Ваучеры"""
Updated,Обновлено
Updated Birthday Reminders,Обновлен День рождения Напоминания
Upload Attendance,Добавить посещаемости
@@ -3237,7 +3237,7 @@
Write Off Based On,Списание на основе
Write Off Cost Center,Списание МВЗ
Write Off Outstanding Amount,Списание суммы задолженности
-Write Off Voucher,Списание ваучер
+Write Off Entry,Списание ваучер
Wrong Template: Unable to find head row.,Неправильный Шаблон: Не удается найти голову строку.
Year,Года
Year Closed,Год закрыт
@@ -3255,7 +3255,7 @@
You can enter the minimum quantity of this item to be ordered.,Вы можете ввести минимальное количество этого пункта заказывается.
You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,"не Вы не можете войти как Delivery Note Нет и Расходная накладная номер Пожалуйста, введите любой."
-You can not enter current voucher in 'Against Journal Voucher' column,"Вы не можете ввести текущий ваучер в ""Против Journal ваучер 'колонке"
+You can not enter current voucher in 'Against Journal Entry' column,"Вы не можете ввести текущий ваучер в ""Против Journal ваучер 'колонке"
You can set Default Bank Account in Company master,Вы можете установить по умолчанию банковский счет в мастер компании
You can start by selecting backup frequency and granting access for sync,Вы можете начать с выбора частоты резервного копирования и предоставления доступа для синхронизации
You can submit this Stock Reconciliation.,Вы можете представить эту Stock примирения.
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index f39e98c..4fb2421 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -152,8 +152,8 @@
Against Document No,Против документу Нема
Against Expense Account,Против трошковником налог
Against Income Account,Против приход
-Against Journal Voucher,Против Јоурнал ваучер
-Against Journal Voucher {0} does not have any unmatched {1} entry,Против Јоурнал ваучер {0} нема премца {1} унос
+Against Journal Entry,Против Јоурнал ваучер
+Against Journal Entry {0} does not have any unmatched {1} entry,Против Јоурнал ваучер {0} нема премца {1} унос
Against Purchase Invoice,Против фактури
Against Sales Invoice,Против продаје фактура
Against Sales Order,Против продаје налога
@@ -335,7 +335,7 @@
Bank Reconciliation,Банка помирење
Bank Reconciliation Detail,Банка помирење Детаљ
Bank Reconciliation Statement,Банка помирење Изјава
-Bank Voucher,Банка ваучера
+Bank Entry,Банка ваучера
Bank/Cash Balance,Банка / стање готовине
Banking,банкарство
Barcode,Баркод
@@ -470,7 +470,7 @@
Case No. cannot be 0,Предмет бр не може бити 0
Cash,Готовина
Cash In Hand,Наличность кассовая
-Cash Voucher,Готовина ваучера
+Cash Entry,Готовина ваучера
Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
Cash/Bank Account,Готовина / банковног рачуна
Casual Leave,Повседневная Оставить
@@ -594,7 +594,7 @@
Contacts,связи
Content,Садржина
Content Type,Тип садржаја
-Contra Voucher,Цонтра ваучера
+Contra Entry,Цонтра ваучера
Contract,уговор
Contract End Date,Уговор Датум завршетка
Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
@@ -625,7 +625,7 @@
Country Name,Земља Име
Country wise default Address Templates,Земља мудар подразумевана адреса шаблон
"Country, Timezone and Currency","Земља , временску зону и валута"
-Create Bank Voucher for the total salary paid for the above selected criteria,Креирање ваучера банка за укупне плате исплаћене за горе изабраним критеријумима
+Create Bank Entry for the total salary paid for the above selected criteria,Креирање ваучера банка за укупне плате исплаћене за горе изабраним критеријумима
Create Customer,Креирање корисника
Create Material Requests,Креирате захтеве Материјал
Create New,Цреате Нев
@@ -647,7 +647,7 @@
Credit,Кредит
Credit Amt,Кредитни Амт
Credit Card,кредитна картица
-Credit Card Voucher,Кредитна картица ваучера
+Credit Card Entry,Кредитна картица ваучера
Credit Controller,Кредитни контролер
Credit Days,Кредитни Дана
Credit Limit,Кредитни лимит
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Акцизе Еду Цесс 2
Excise Duty SHE Cess 1,Акцизе ОНА Цесс 1
Excise Page Number,Акцизе Број странице
-Excise Voucher,Акцизе ваучера
+Excise Entry,Акцизе ваучера
Execution,извршење
Executive Search,Екецутиве Сеарцх
Exemption Limit,Изузеће Лимит
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Счет Период С и счет-фактура Период до даты обязательных для повторяющихся счет
Invoice Period To,Фактура период до
Invoice Type,Фактура Тип
-Invoice/Journal Voucher Details,Рачун / Часопис ваучера Детаљи
+Invoice/Journal Entry Details,Рачун / Часопис ваучера Детаљи
Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
Is Active,Је активан
Is Advance,Да ли Адванце
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Послови Емаил подешавања
Journal Entries,Часопис Ентриес
Journal Entry,Јоурнал Ентри
-Journal Voucher,Часопис ваучера
+Journal Entry,Часопис ваучера
Journal Entry Account,Часопис Ваучер Детаљ
Journal Entry Account No,Часопис Ваучер Детаљ Нема
-Journal Voucher {0} does not have account {1} or already matched,Часопис Ваучер {0} нема рачун {1} или већ упарен
-Journal Vouchers {0} are un-linked,Журнал Ваучеры {0} являются не- связаны
+Journal Entry {0} does not have account {1} or already matched,Часопис Ваучер {0} нема рачун {1} или већ упарен
+Journal Entries {0} are un-linked,Журнал Ваучеры {0} являются не- связаны
Keep a track of communication related to this enquiry which will help for future reference.,Водите евиденцију о комуникацији у вези са овом истрагу која ће помоћи за будућу референцу.
Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
Key Performance Area,Кључна Перформансе Област
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Мајор / Опциони предмети
Make ,Make
Make Accounting Entry For Every Stock Movement,Направите Рачуноводство унос за сваки Стоцк Покрета
-Make Bank Voucher,Направите ваучер Банк
+Make Bank Entry,Направите ваучер Банк
Make Credit Note,Маке Цредит Ноте
Make Debit Note,Маке задужењу
Make Delivery,Маке Деливери
@@ -3096,7 +3096,7 @@
Update Series Number,Упдате Број
Update Stock,Упдате Стоцк
Update bank payment dates with journals.,Ажурирање банка плаћање датира са часописима.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',"Клиренс Ажурирање датум уноса у дневник означена као "" банка "" Ваучери"
+Update clearance date of Journal Entries marked as 'Bank Entry',"Клиренс Ажурирање датум уноса у дневник означена као "" банка "" Ваучери"
Updated,Ажурирано
Updated Birthday Reminders,Ажурирано Рођендан Подсетници
Upload Attendance,Уплоад присуствовање
@@ -3234,7 +3234,7 @@
Write Off Based On,Отпис Басед Он
Write Off Cost Center,Отпис Центар трошкова
Write Off Outstanding Amount,Отпис неизмирени износ
-Write Off Voucher,Отпис ваучер
+Write Off Entry,Отпис ваучер
Wrong Template: Unable to find head row.,Погрешно Шаблон: Није могуће пронаћи ред главу.
Year,Година
Year Closed,Година Цлосед
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Можете да унесете минималну количину ове ставке се могу наручити.
You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Не можете да унесете како доставници Не и продаје Фактура бр Унесите било коју .
-You can not enter current voucher in 'Against Journal Voucher' column,"Вы не можете ввести текущий ваучер в ""Против Journal ваучер ' колонке"
+You can not enter current voucher in 'Against Journal Entry' column,"Вы не можете ввести текущий ваучер в ""Против Journal ваучер ' колонке"
You can set Default Bank Account in Company master,Вы можете установить по умолчанию банковский счет в мастер компании
You can start by selecting backup frequency and granting access for sync,Вы можете начать с выбора частоты резервного копирования и предоставления доступа для синхронизации
You can submit this Stock Reconciliation.,Можете да пошаљете ову Стоцк помирење .
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 931353d..dab0fc4 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -152,8 +152,8 @@
Against Document No,ஆவண எதிராக இல்லை
Against Expense Account,செலவு கணக்கு எதிராக
Against Income Account,வருமான கணக்கு எதிராக
-Against Journal Voucher,ஜர்னல் வவுச்சர் எதிராக
-Against Journal Voucher {0} does not have any unmatched {1} entry,ஜர்னல் வவுச்சர் எதிரான {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
+Against Journal Entry,ஜர்னல் வவுச்சர் எதிராக
+Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் வவுச்சர் எதிரான {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
Against Purchase Invoice,கொள்முதல் விலை விவரம் எதிராக
Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
Against Sales Order,விற்னையாளர் எதிராக
@@ -335,7 +335,7 @@
Bank Reconciliation,வங்கி நல்லிணக்க
Bank Reconciliation Detail,வங்கி நல்லிணக்க விரிவாக
Bank Reconciliation Statement,வங்கி நல்லிணக்க அறிக்கை
-Bank Voucher,வங்கி வவுச்சர்
+Bank Entry,வங்கி வவுச்சர்
Bank/Cash Balance,வங்கி / ரொக்க இருப்பு
Banking,வங்கி
Barcode,பார்கோடு
@@ -470,7 +470,7 @@
Case No. cannot be 0,வழக்கு எண் 0 இருக்க முடியாது
Cash,பணம்
Cash In Hand,கைப்பணம்
-Cash Voucher,பண வவுச்சர்
+Cash Entry,பண வவுச்சர்
Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
Cash/Bank Account,பண / வங்கி கணக்கு
Casual Leave,தற்செயல் விடுப்பு
@@ -594,7 +594,7 @@
Contacts,தொடர்புகள்
Content,உள்ளடக்கம்
Content Type,உள்ளடக்க வகை
-Contra Voucher,எதிர் வவுச்சர்
+Contra Entry,எதிர் வவுச்சர்
Contract,ஒப்பந்த
Contract End Date,ஒப்பந்தம் முடிவு தேதி
Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
@@ -625,7 +625,7 @@
Country Name,நாட்டின் பெயர்
Country wise default Address Templates,நாடு வாரியாக இயல்புநிலை முகவரி டெம்ப்ளேட்கள்
"Country, Timezone and Currency","நாடு , நேர மண்டலம் மற்றும் நாணய"
-Create Bank Voucher for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட அடிப்படை ஊதியம் மொத்த சம்பளம் வங்கி வவுச்சர் உருவாக்க
+Create Bank Entry for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட அடிப்படை ஊதியம் மொத்த சம்பளம் வங்கி வவுச்சர் உருவாக்க
Create Customer,உருவாக்கு
Create Material Requests,பொருள் கோரிக்கைகள் உருவாக்க
Create New,புதிய உருவாக்கவும்
@@ -647,7 +647,7 @@
Credit,கடன்
Credit Amt,கடன் AMT
Credit Card,கடன் அட்டை
-Credit Card Voucher,கடன் அட்டை வவுச்சர்
+Credit Card Entry,கடன் அட்டை வவுச்சர்
Credit Controller,கடன் கட்டுப்பாட்டாளர்
Credit Days,கடன் நாட்கள்
Credit Limit,கடன் எல்லை
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,உற்பத்தி வரி குன்றம் செஸ் 2
Excise Duty SHE Cess 1,உற்பத்தி வரி அவள் செஸ் 1
Excise Page Number,கலால் பக்கம் எண்
-Excise Voucher,கலால் வவுச்சர்
+Excise Entry,கலால் வவுச்சர்
Execution,நிர்வாகத்தினருக்கு
Executive Search,நிறைவேற்று தேடல்
Exemption Limit,விலக்கு வரம்பு
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,விலைப்பட்டியல் மீண்டும் கட்டாயமாக தேதிகள் மற்றும் விலைப்பட்டியல் காலம் விலைப்பட்டியல் காலம்
Invoice Period To,செய்ய விலைப்பட்டியல் காலம்
Invoice Type,விலைப்பட்டியல் வகை
-Invoice/Journal Voucher Details,விலைப்பட்டியல் / ஜர்னல் ரசீது விவரங்கள்
+Invoice/Journal Entry Details,விலைப்பட்டியல் / ஜர்னல் ரசீது விவரங்கள்
Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
Is Active,செயலில் உள்ளது
Is Advance,முன்பணம்
@@ -1457,11 +1457,11 @@
Jobs Email Settings,வேலைகள் மின்னஞ்சல் அமைப்புகள்
Journal Entries,ஜர்னல் பதிவுகள்
Journal Entry,பத்திரிகை நுழைவு
-Journal Voucher,பத்திரிகை வவுச்சர்
+Journal Entry,பத்திரிகை வவுச்சர்
Journal Entry Account,பத்திரிகை வவுச்சர் விரிவாக
Journal Entry Account No,பத்திரிகை வவுச்சர் விரிவாக இல்லை
-Journal Voucher {0} does not have account {1} or already matched,ஜர்னல் வவுச்சர் {0} கணக்கு இல்லை {1} அல்லது ஏற்கனவே பொருந்தியது
-Journal Vouchers {0} are un-linked,ஜர்னல் கே {0} ஐ.நா. இணைக்கப்பட்ட
+Journal Entry {0} does not have account {1} or already matched,ஜர்னல் வவுச்சர் {0} கணக்கு இல்லை {1} அல்லது ஏற்கனவே பொருந்தியது
+Journal Entries {0} are un-linked,ஜர்னல் கே {0} ஐ.நா. இணைக்கப்பட்ட
Keep a track of communication related to this enquiry which will help for future reference.,எதிர்கால உதவும் இந்த விசாரணை தொடர்பான தகவல் ஒரு கண்காணிக்க.
Keep it web friendly 900px (w) by 100px (h),100px வலை நட்பு 900px ( W ) வைத்து ( H )
Key Performance Area,முக்கிய செயல்திறன் பகுதி
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,முக்கிய / விருப்ப பாடங்கள்
Make ,Make
Make Accounting Entry For Every Stock Movement,"ஒவ்வொரு பங்கு இயக்கம் , பைனான்ஸ் உள்ளீடு செய்ய"
-Make Bank Voucher,வங்கி வவுச்சர் செய்ய
+Make Bank Entry,வங்கி வவுச்சர் செய்ய
Make Credit Note,கடன் நினைவில் கொள்ளுங்கள்
Make Debit Note,பற்று நினைவில் கொள்ளுங்கள்
Make Delivery,விநியோகம் செய்ய
@@ -3096,7 +3096,7 @@
Update Series Number,மேம்படுத்தல் தொடர் எண்
Update Stock,பங்கு புதுப்பிக்க
Update bank payment dates with journals.,மேம்படுத்தல் வங்கி பணம் பத்திரிகைகள் மூலம் செல்கிறது.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',ஜர்னல் பதிவுகள் புதுப்பிக்கவும் அனுமதி தேதி ' வங்கி உறுதி சீட்டு ' என குறிக்கப்பட்ட
+Update clearance date of Journal Entries marked as 'Bank Entry',ஜர்னல் பதிவுகள் புதுப்பிக்கவும் அனுமதி தேதி ' வங்கி உறுதி சீட்டு ' என குறிக்கப்பட்ட
Updated,புதுப்பிக்கப்பட்ட
Updated Birthday Reminders,இற்றை நினைவூட்டல்கள்
Upload Attendance,பங்கேற்கும் பதிவேற்ற
@@ -3234,7 +3234,7 @@
Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
Write Off Cost Center,செலவு மையம் இனிய எழுத
Write Off Outstanding Amount,சிறந்த தொகை இனிய எழுத
-Write Off Voucher,வவுச்சர் இனிய எழுத
+Write Off Entry,வவுச்சர் இனிய எழுத
Wrong Template: Unable to find head row.,தவறான வார்ப்புரு: தலை வரிசையில் கண்டுபிடிக்க முடியவில்லை.
Year,ஆண்டு
Year Closed,ஆண்டு மூடப்பட்ட
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,நீங்கள் கட்டளையிட்ட வேண்டும் இந்த உருப்படியை குறைந்தபட்ச அளவு நுழைய முடியாது.
You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,நீங்கள் எந்த இரு விநியோக குறிப்பு நுழைய முடியாது மற்றும் விற்பனை விலைப்பட்டியல் இல்லை எந்த ஒரு உள்ளிடவும்.
-You can not enter current voucher in 'Against Journal Voucher' column,நீங்கள் பத்தியில் ' ஜர்னல் வவுச்சர் எதிரான' தற்போதைய ரசீது நுழைய முடியாது
+You can not enter current voucher in 'Against Journal Entry' column,நீங்கள் பத்தியில் ' ஜர்னல் வவுச்சர் எதிரான' தற்போதைய ரசீது நுழைய முடியாது
You can set Default Bank Account in Company master,நீங்கள் நிறுவனத்தின் மாஸ்டர் இயல்புநிலை வங்கி கணக்கு அமைக்க முடியும்
You can start by selecting backup frequency and granting access for sync,நீங்கள் காப்பு அதிர்வெண் தேர்வு மற்றும் ஒருங்கிணைப்பு அணுகல் வழங்குவதன் மூலம் தொடங்க முடியும்
You can submit this Stock Reconciliation.,இந்த பங்கு நல்லிணக்க சமர்ப்பிக்க முடியும் .
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index b1b0ebd..ef50692 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -152,8 +152,8 @@
Against Document No,กับเอกสารเลขที่
Against Expense Account,กับบัญชีค่าใช้จ่าย
Against Income Account,กับบัญชีรายได้
-Against Journal Voucher,กับบัตรกำนัลวารสาร
-Against Journal Voucher {0} does not have any unmatched {1} entry,กับ วารสาร คูปอง {0} ไม่มี ใครเทียบ {1} รายการ
+Against Journal Entry,กับบัตรกำนัลวารสาร
+Against Journal Entry {0} does not have any unmatched {1} entry,กับ วารสาร คูปอง {0} ไม่มี ใครเทียบ {1} รายการ
Against Purchase Invoice,กับใบกำกับซื้อ
Against Sales Invoice,กับขายใบแจ้งหนี้
Against Sales Order,กับ การขายสินค้า
@@ -335,7 +335,7 @@
Bank Reconciliation,กระทบยอดธนาคาร
Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
Bank Reconciliation Statement,งบกระทบยอดธนาคาร
-Bank Voucher,บัตรกำนัลธนาคาร
+Bank Entry,บัตรกำนัลธนาคาร
Bank/Cash Balance,ธนาคารเงินสด / ยอดคงเหลือ
Banking,การธนาคาร
Barcode,บาร์โค้ด
@@ -470,7 +470,7 @@
Case No. cannot be 0,คดีหมายเลข ไม่สามารถ เป็น 0
Cash,เงินสด
Cash In Hand,เงินสด ใน มือ
-Cash Voucher,บัตรกำนัลเงินสด
+Cash Entry,บัตรกำนัลเงินสด
Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
Cash/Bank Account,เงินสด / บัญชีธนาคาร
Casual Leave,สบาย ๆ ออก
@@ -594,7 +594,7 @@
Contacts,ติดต่อ
Content,เนื้อหา
Content Type,ประเภทเนื้อหา
-Contra Voucher,บัตรกำนัลต้าน
+Contra Entry,บัตรกำนัลต้าน
Contract,สัญญา
Contract End Date,วันที่สิ้นสุดสัญญา
Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
@@ -625,7 +625,7 @@
Country Name,ชื่อประเทศ
Country wise default Address Templates,แม่แบบของประเทศที่อยู่เริ่มต้นอย่างชาญฉลาด
"Country, Timezone and Currency",โซน ประเทศ และ สกุลเงิน
-Create Bank Voucher for the total salary paid for the above selected criteria,สร้างบัตรกำนัลธนาคารเพื่อการรวมเงินเดือนที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
+Create Bank Entry for the total salary paid for the above selected criteria,สร้างบัตรกำนัลธนาคารเพื่อการรวมเงินเดือนที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
Create Customer,สร้าง ลูกค้า
Create Material Requests,ขอสร้างวัสดุ
Create New,สร้างใหม่
@@ -647,7 +647,7 @@
Credit,เครดิต
Credit Amt,จำนวนเครดิต
Credit Card,บัตรเครดิต
-Credit Card Voucher,บัตรกำนัลชำระด้วยบัตรเครดิต
+Credit Card Entry,บัตรกำนัลชำระด้วยบัตรเครดิต
Credit Controller,ควบคุมเครดิต
Credit Days,วันเครดิต
Credit Limit,วงเงินสินเชื่อ
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,สรรพสามิตหน้าที่ Edu Cess 2
Excise Duty SHE Cess 1,สรรพสามิตหน้าที่ SHE Cess 1
Excise Page Number,หมายเลขหน้าสรรพสามิต
-Excise Voucher,บัตรกำนัลสรรพสามิต
+Excise Entry,บัตรกำนัลสรรพสามิต
Execution,การปฏิบัติ
Executive Search,การค้นหา ผู้บริหาร
Exemption Limit,วงเงินข้อยกเว้น
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,ระยะเวลา ใบแจ้งหนี้ จาก ใบแจ้งหนี้ และ ระยะเวลา ในการ บังคับใช้ วันที่ ของใบแจ้งหนี้ ที่เกิดขึ้น
Invoice Period To,ระยะเวลาใบแจ้งหนี้เพื่อ
Invoice Type,ประเภทใบแจ้งหนี้
-Invoice/Journal Voucher Details,ใบแจ้งหนี้ / วารสารรายละเอียดคูปอง
+Invoice/Journal Entry Details,ใบแจ้งหนี้ / วารสารรายละเอียดคูปอง
Invoiced Amount (Exculsive Tax),จำนวนเงินที่ ออกใบแจ้งหนี้ ( Exculsive ภาษี )
Is Active,มีการใช้งาน
Is Advance,ล่วงหน้า
@@ -1457,11 +1457,11 @@
Jobs Email Settings,งานการตั้งค่าอีเมล
Journal Entries,บันทึกรายการแบบรวม
Journal Entry,บันทึกรายการค้า
-Journal Voucher,บัตรกำนัลวารสาร
+Journal Entry,บัตรกำนัลวารสาร
Journal Entry Account,รายละเอียดใบสำคัญรายวันทั่วไป
Journal Entry Account No,รายละเอียดใบสำคัญรายวันทั่วไปไม่มี
-Journal Voucher {0} does not have account {1} or already matched,ใบสำคัญรายวันทั่วไป {0} ไม่ได้มี บัญชี {1} หรือ การจับคู่ แล้ว
-Journal Vouchers {0} are un-linked,ใบสำคัญรายวันทั่วไป {0} จะ ยกเลิกการ เชื่อมโยง
+Journal Entry {0} does not have account {1} or already matched,ใบสำคัญรายวันทั่วไป {0} ไม่ได้มี บัญชี {1} หรือ การจับคู่ แล้ว
+Journal Entries {0} are un-linked,ใบสำคัญรายวันทั่วไป {0} จะ ยกเลิกการ เชื่อมโยง
Keep a track of communication related to this enquiry which will help for future reference.,ติดตามของการสื่อสารที่เกี่ยวข้องกับการสืบสวนเรื่องนี้ซึ่งจะช่วยให้สำหรับการอ้างอิงในอนาคต
Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
Key Performance Area,พื้นที่การดำเนินงานหลัก
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,วิชาเอก / เสริม
Make ,สร้าง
Make Accounting Entry For Every Stock Movement,ทำให้ รายการ บัญชี สำหรับ ทุก การเคลื่อนไหวของ หุ้น
-Make Bank Voucher,ทำให้บัตรของธนาคาร
+Make Bank Entry,ทำให้บัตรของธนาคาร
Make Credit Note,ให้ เครดิต หมายเหตุ
Make Debit Note,ให้ หมายเหตุ เดบิต
Make Delivery,ทำให้ การจัดส่งสินค้า
@@ -3096,7 +3096,7 @@
Update Series Number,จำนวน Series ปรับปรุง
Update Stock,อัพเดทสต็อก
Update bank payment dates with journals.,การชำระเงินของธนาคารปรับปรุงวันที่มีวารสาร
-Update clearance date of Journal Entries marked as 'Bank Vouchers',ปรับปรุง การกวาดล้าง ของ อนุทิน ทำเครื่องหมายเป็น ' ธนาคาร บัตรกำนัล '
+Update clearance date of Journal Entries marked as 'Bank Entry',ปรับปรุง การกวาดล้าง ของ อนุทิน ทำเครื่องหมายเป็น ' ธนาคาร บัตรกำนัล '
Updated,อัพเดต
Updated Birthday Reminders,การปรับปรุง การแจ้งเตือน วันเกิด
Upload Attendance,อัพโหลดผู้เข้าร่วม
@@ -3234,7 +3234,7 @@
Write Off Based On,เขียนปิดขึ้นอยู่กับ
Write Off Cost Center,เขียนปิดศูนย์ต้นทุน
Write Off Outstanding Amount,เขียนปิดยอดคงค้าง
-Write Off Voucher,เขียนทันทีบัตรกำนัล
+Write Off Entry,เขียนทันทีบัตรกำนัล
Wrong Template: Unable to find head row.,แม่แบบผิด: ไม่สามารถหาแถวหัว
Year,ปี
Year Closed,ปีที่ปิด
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,คุณสามารถป้อนปริมาณขั้นต่ำของรายการนี้จะได้รับคำสั่ง
You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,คุณไม่สามารถป้อน การจัดส่งสินค้า ทั้ง หมายเหตุ ไม่มี และ ขายใบแจ้งหนี้ ฉบับ กรุณากรอก คนใดคนหนึ่ง
-You can not enter current voucher in 'Against Journal Voucher' column,คุณไม่สามารถป้อน คูปอง ในปัจจุบันใน ' กับ วารสาร คูปอง ' คอลัมน์
+You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถป้อน คูปอง ในปัจจุบันใน ' กับ วารสาร คูปอง ' คอลัมน์
You can set Default Bank Account in Company master,คุณสามารถตั้งค่า เริ่มต้น ใน บัญชีธนาคาร หลัก ของ บริษัท
You can start by selecting backup frequency and granting access for sync,คุณสามารถเริ่มต้น ด้วยการเลือก ความถี่ สำรองข้อมูลและ การอนุญาต การเข้าถึงสำหรับ การซิงค์
You can submit this Stock Reconciliation.,คุณสามารถส่ง รูป นี้ สมานฉันท์
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index a2d4443..3d13bcf 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -152,8 +152,8 @@
Against Document No,Against Document No
Against Expense Account,Against Expense Account
Against Income Account,Against Income Account
-Against Journal Voucher,Against Journal Voucher
-Against Journal Voucher {0} does not have any unmatched {1} entry,Dergi Çeki karşı {0} herhangi bir eşsiz {1} girdi yok
+Against Journal Entry,Against Journal Entry
+Against Journal Entry {0} does not have any unmatched {1} entry,Dergi Çeki karşı {0} herhangi bir eşsiz {1} girdi yok
Against Purchase Invoice,Against Purchase Invoice
Against Sales Invoice,Against Sales Invoice
Against Sales Order,Satış Siparişi karşı
@@ -335,7 +335,7 @@
Bank Reconciliation,Banka Uzlaşma
Bank Reconciliation Detail,Banka Uzlaşma Detay
Bank Reconciliation Statement,Banka Uzlaşma Bildirimi
-Bank Voucher,Banka Çeki
+Bank Entry,Banka Çeki
Bank/Cash Balance,Banka / Nakit Dengesi
Banking,Bankacılık
Barcode,Barkod
@@ -470,7 +470,7 @@
Case No. cannot be 0,Örnek Numarası 0 olamaz
Cash,Nakit
Cash In Hand,Kasa mevcudu
-Cash Voucher,Para yerine geçen belge
+Cash Entry,Para yerine geçen belge
Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
Cash/Bank Account,Kasa / Banka Hesabı
Casual Leave,Casual bırak
@@ -594,7 +594,7 @@
Contacts,İletişimler
Content,İçerik
Content Type,İçerik Türü
-Contra Voucher,Contra Çeki
+Contra Entry,Contra Çeki
Contract,Sözleşme
Contract End Date,Sözleşme Bitiş Tarihi
Contract End Date must be greater than Date of Joining,Sözleşme Bitiş Tarihi Katılma tarihinden daha büyük olmalıdır
@@ -625,7 +625,7 @@
Country Name,Ülke Adı
Country wise default Address Templates,Ülke bilge varsayılan Adres Şablonları
"Country, Timezone and Currency","Ülke, Saat Dilimi ve Döviz"
-Create Bank Voucher for the total salary paid for the above selected criteria,Yukarıda seçilen ölçütler için ödenen toplam maaş için Banka Çeki oluştur
+Create Bank Entry for the total salary paid for the above selected criteria,Yukarıda seçilen ölçütler için ödenen toplam maaş için Banka Çeki oluştur
Create Customer,Müşteri Oluştur
Create Material Requests,Malzeme İstekleri Oluştur
Create New,Yeni Oluştur
@@ -647,7 +647,7 @@
Credit,Kredi
Credit Amt,Kredi Tutarı
Credit Card,Kredi kartı
-Credit Card Voucher,Kredi Kartı Çeki
+Credit Card Entry,Kredi Kartı Çeki
Credit Controller,Kredi Kontrolör
Credit Days,Kredi Gün
Credit Limit,Kredi Limiti
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,ÖTV Edu Cess 2
Excise Duty SHE Cess 1,ÖTV SHE Cess 1
Excise Page Number,Tüketim Sayfa Numarası
-Excise Voucher,Tüketim Çeki
+Excise Entry,Tüketim Çeki
Execution,Yerine Getirme
Executive Search,Executive Search
Exemption Limit,Muafiyet Sınırı
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Faturayı yinelenen zorunlu tarihler için ve Fatura Dönemi itibaren Fatura Dönemi
Invoice Period To,Için Fatura Dönemi
Invoice Type,Fatura Türü
-Invoice/Journal Voucher Details,Fatura / Dergi Çeki Detayları
+Invoice/Journal Entry Details,Fatura / Dergi Çeki Detayları
Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Exculsive Vergisi)
Is Active,Aktif mi
Is Advance,Peşin mi
@@ -1457,11 +1457,11 @@
Jobs Email Settings,İş E-posta Ayarları
Journal Entries,Alacak/Borç Girişleri
Journal Entry,Alacak/Borç Girişleri
-Journal Voucher,Alacak/Borç Çeki
+Journal Entry,Alacak/Borç Çeki
Journal Entry Account,Alacak/Borç Fiş Detay
Journal Entry Account No,Alacak/Borç Fiş Detay No
-Journal Voucher {0} does not have account {1} or already matched,Dergi Çeki {0} hesabı yok {1} ya da zaten eşleşti
-Journal Vouchers {0} are un-linked,Dergi Fişler {0} un-bağlantılı
+Journal Entry {0} does not have account {1} or already matched,Dergi Çeki {0} hesabı yok {1} ya da zaten eşleşti
+Journal Entries {0} are un-linked,Dergi Fişler {0} un-bağlantılı
Keep a track of communication related to this enquiry which will help for future reference.,Gelecekte başvurulara yardımcı olmak için bu soruşturma ile ilgili bir iletişim takip edin.
Keep it web friendly 900px (w) by 100px (h),100px tarafından web dostu 900px (w) it Keep (h)
Key Performance Area,Anahtar Performans Alan
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Zorunlu / Opsiyonel Konular
Make ,Make
Make Accounting Entry For Every Stock Movement,Her Stok Hareketi İçin Muhasebe kaydı yapmak
-Make Bank Voucher,Banka Çeki Yap
+Make Bank Entry,Banka Çeki Yap
Make Credit Note,Kredi Not Yap
Make Debit Note,Banka Not Yap
Make Delivery,Teslim olun
@@ -3096,7 +3096,7 @@
Update Series Number,Update Serisi sayısı
Update Stock,Stok Güncelleme
Update bank payment dates with journals.,Update bank payment dates with journals.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Journal Entries Update temizlenme tarihi 'Banka Fişler' olarak işaretlenmiş
+Update clearance date of Journal Entries marked as 'Bank Entry',Journal Entries Update temizlenme tarihi 'Banka Fişler' olarak işaretlenmiş
Updated,Güncellenmiş
Updated Birthday Reminders,Güncelleme Birthday Reminders
Upload Attendance,Katılımcı ekle
@@ -3234,7 +3234,7 @@
Write Off Based On,Write Off Based On
Write Off Cost Center,Write Off Cost Center
Write Off Outstanding Amount,Write Off Outstanding Amount
-Write Off Voucher,Write Off Voucher
+Write Off Entry,Write Off Entry
Wrong Template: Unable to find head row.,Yanlış Şablon: kafa satır bulmak için açılamıyor.
Year,Yıl
Year Closed,Yıl Kapalı
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Sen sipariş için bu maddenin minimum miktar girebilirsiniz.
You can not change rate if BOM mentioned agianst any item,BOM herhangi bir öğenin agianst söz eğer hızını değiştiremezsiniz
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Hayır hem Teslim Not giremezsiniz ve Satış Fatura No birini girin.
-You can not enter current voucher in 'Against Journal Voucher' column,Sen sütununda 'Journal Fiş Karşı' cari fiş giremezsiniz
+You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal Fiş Karşı' cari fiş giremezsiniz
You can set Default Bank Account in Company master,Siz Firma master Varsayılan Banka Hesap ayarlayabilirsiniz
You can start by selecting backup frequency and granting access for sync,Yedekleme sıklığını seçme ve senkronizasyon için erişim sağlayarak başlayabilirsiniz
You can submit this Stock Reconciliation.,Bu Stok Uzlaşma gönderebilirsiniz.
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 0fb6f52..416a231 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -152,8 +152,8 @@
Against Document No,Đối với văn bản số
Against Expense Account,Đối với tài khoản chi phí
Against Income Account,Đối với tài khoản thu nhập
-Against Journal Voucher,Tạp chí chống lại Voucher
-Against Journal Voucher {0} does not have any unmatched {1} entry,Đối với Tạp chí Chứng từ {0} không có bất kỳ chưa từng có {1} nhập
+Against Journal Entry,Tạp chí chống lại Voucher
+Against Journal Entry {0} does not have any unmatched {1} entry,Đối với Tạp chí Chứng từ {0} không có bất kỳ chưa từng có {1} nhập
Against Purchase Invoice,Đối với hóa đơn mua hàng
Against Sales Invoice,Chống bán hóa đơn
Against Sales Order,So với bán hàng đặt hàng
@@ -335,7 +335,7 @@
Bank Reconciliation,Ngân hàng hòa giải
Bank Reconciliation Detail,Ngân hàng hòa giải chi tiết
Bank Reconciliation Statement,Trữ ngân hàng hòa giải
-Bank Voucher,Ngân hàng Phiếu
+Bank Entry,Ngân hàng Phiếu
Bank/Cash Balance,Ngân hàng / Cash Balance
Banking,Ngân hàng
Barcode,Mã vạch
@@ -470,7 +470,7 @@
Case No. cannot be 0,Trường hợp số không thể là 0
Cash,Tiền mặt
Cash In Hand,Tiền mặt trong tay
-Cash Voucher,Phiếu tiền mặt
+Cash Entry,Phiếu tiền mặt
Cash or Bank Account is mandatory for making payment entry,Tiền mặt hoặc tài khoản ngân hàng là bắt buộc đối với việc nhập cảnh thanh toán
Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
Casual Leave,Để lại bình thường
@@ -594,7 +594,7 @@
Contacts,Danh bạ
Content,Lọc nội dung
Content Type,Loại nội dung
-Contra Voucher,Contra Voucher
+Contra Entry,Contra Entry
Contract,hợp đồng
Contract End Date,Ngày kết thúc hợp đồng
Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày của Tham gia
@@ -625,7 +625,7 @@
Country Name,Tên nước
Country wise default Address Templates,Nước khôn ngoan Địa chỉ mặc định Templates
"Country, Timezone and Currency","Quốc gia, múi giờ và tiền tệ"
-Create Bank Voucher for the total salary paid for the above selected criteria,Tạo Ngân hàng Chứng từ tổng tiền lương cho các tiêu chí lựa chọn ở trên
+Create Bank Entry for the total salary paid for the above selected criteria,Tạo Ngân hàng Chứng từ tổng tiền lương cho các tiêu chí lựa chọn ở trên
Create Customer,Tạo ra khách hàng
Create Material Requests,Các yêu cầu tạo ra vật liệu
Create New,Tạo mới
@@ -647,7 +647,7 @@
Credit,Tín dụng
Credit Amt,Tín dụng Amt
Credit Card,Thẻ tín dụng
-Credit Card Voucher,Phiếu thẻ tín dụng
+Credit Card Entry,Phiếu thẻ tín dụng
Credit Controller,Bộ điều khiển tín dụng
Credit Days,Ngày tín dụng
Credit Limit,Hạn chế tín dụng
@@ -979,7 +979,7 @@
Excise Duty Edu Cess 2,Tiêu thụ đặc biệt Duty Edu Cess 2
Excise Duty SHE Cess 1,Tiêu thụ đặc biệt Duty SHE Cess 1
Excise Page Number,Tiêu thụ đặc biệt số trang
-Excise Voucher,Phiếu tiêu thụ đặc biệt
+Excise Entry,Phiếu tiêu thụ đặc biệt
Execution,Thực hiện
Executive Search,Điều hành Tìm kiếm
Exemption Limit,Giới hạn miễn
@@ -1327,7 +1327,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,Thời gian hóa đơn từ và hóa đơn Thời gian Để ngày bắt buộc đối với hóa đơn định kỳ
Invoice Period To,Hóa đơn Thời gian để
Invoice Type,Loại hóa đơn
-Invoice/Journal Voucher Details,Hóa đơn / Tạp chí Chứng từ chi tiết
+Invoice/Journal Entry Details,Hóa đơn / Tạp chí Chứng từ chi tiết
Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế Exculsive)
Is Active,Là hoạt động
Is Advance,Là Trước
@@ -1457,11 +1457,11 @@
Jobs Email Settings,Thiết lập việc làm Email
Journal Entries,Tạp chí Entries
Journal Entry,Tạp chí nhập
-Journal Voucher,Tạp chí Voucher
+Journal Entry,Tạp chí Voucher
Journal Entry Account,Tạp chí Chứng từ chi tiết
Journal Entry Account No,Tạp chí Chứng từ chi tiết Không
-Journal Voucher {0} does not have account {1} or already matched,Tạp chí Chứng từ {0} không có tài khoản {1} hoặc đã khớp
-Journal Vouchers {0} are un-linked,Tạp chí Chứng từ {0} được bỏ liên kết
+Journal Entry {0} does not have account {1} or already matched,Tạp chí Chứng từ {0} không có tài khoản {1} hoặc đã khớp
+Journal Entries {0} are un-linked,Tạp chí Chứng từ {0} được bỏ liên kết
Keep a track of communication related to this enquiry which will help for future reference.,Giữ một ca khúc của truyền thông liên quan đến cuộc điều tra này sẽ giúp cho tài liệu tham khảo trong tương lai.
Keep it web friendly 900px (w) by 100px (h),Giữ cho nó thân thiện với web 900px (w) bởi 100px (h)
Key Performance Area,Hiệu suất chủ chốt trong khu vực
@@ -1576,7 +1576,7 @@
Major/Optional Subjects,Chính / Đối tượng bắt buộc
Make ,Make
Make Accounting Entry For Every Stock Movement,Làm kế toán nhập Đối với tất cả phong trào Cổ
-Make Bank Voucher,Làm cho Ngân hàng Phiếu
+Make Bank Entry,Làm cho Ngân hàng Phiếu
Make Credit Note,Làm cho tín dụng Ghi chú
Make Debit Note,Làm báo nợ
Make Delivery,Làm cho giao hàng
@@ -3096,7 +3096,7 @@
Update Series Number,Cập nhật Dòng Số
Update Stock,Cập nhật chứng khoán
Update bank payment dates with journals.,Cập nhật ngày thanh toán ngân hàng với các tạp chí.
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Ngày giải phóng mặt bằng bản cập nhật của Tạp chí Entries đánh dấu là 'Ngân hàng Chứng từ'
+Update clearance date of Journal Entries marked as 'Bank Entry',Ngày giải phóng mặt bằng bản cập nhật của Tạp chí Entries đánh dấu là 'Ngân hàng Chứng từ'
Updated,Xin vui lòng viết một cái gì đó
Updated Birthday Reminders,Cập nhật mừng sinh nhật Nhắc nhở
Upload Attendance,Tải lên tham dự
@@ -3234,7 +3234,7 @@
Write Off Based On,Viết Tắt Dựa trên
Write Off Cost Center,Viết Tắt Trung tâm Chi phí
Write Off Outstanding Amount,Viết Tắt Số tiền nổi bật
-Write Off Voucher,Viết Tắt Voucher
+Write Off Entry,Viết Tắt Voucher
Wrong Template: Unable to find head row.,Sai mẫu: Không thể tìm thấy hàng đầu.
Year,Năm
Year Closed,Đóng cửa năm
@@ -3252,7 +3252,7 @@
You can enter the minimum quantity of this item to be ordered.,Bạn có thể nhập số lượng tối thiểu của mặt hàng này được đặt hàng.
You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu HĐQT đã đề cập agianst bất kỳ mục nào
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Bạn không thể gõ cả hai Giao hàng tận nơi Lưu ý Không có hóa đơn bán hàng và số Vui lòng nhập bất kỳ một.
-You can not enter current voucher in 'Against Journal Voucher' column,Bạn không thể nhập chứng từ hiện tại 'chống Tạp chí Voucher' cột
+You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'chống Tạp chí Voucher' cột
You can set Default Bank Account in Company master,Bạn có thể thiết lập Mặc định tài khoản ngân hàng của Công ty chủ
You can start by selecting backup frequency and granting access for sync,Bạn có thể bắt đầu bằng cách chọn tần số sao lưu và cấp quyền truy cập cho đồng bộ
You can submit this Stock Reconciliation.,Bạn có thể gửi hòa giải chứng khoán này.
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index de66f90..7dcf3d1 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -178,8 +178,8 @@
Against Document No,对文件无
Against Expense Account,对费用帐户
Against Income Account,对收入账户
-Against Journal Voucher,对日记帐凭证
-Against Journal Voucher {0} does not have any unmatched {1} entry,对日记帐凭证{0}没有任何无可比拟{1}项目
+Against Journal Entry,对日记帐凭证
+Against Journal Entry {0} does not have any unmatched {1} entry,对日记帐凭证{0}没有任何无可比拟{1}项目
Against Purchase Invoice,对采购发票
Against Sales Invoice,对销售发票
Against Sales Order,对销售订单
@@ -361,7 +361,7 @@
Bank Reconciliation,银行对帐
Bank Reconciliation Detail,银行对帐详细
Bank Reconciliation Statement,银行对帐表
-Bank Voucher,银行券
+Bank Entry,银行券
Bank/Cash Balance,银行/现金结余
Banking,银行业
Barcode,条码
@@ -496,7 +496,7 @@
Case No. cannot be 0,案号不能为0
Cash,现金
Cash In Hand,手头现金
-Cash Voucher,现金券
+Cash Entry,现金券
Cash or Bank Account is mandatory for making payment entry,现金或银行帐户是强制性的付款项
Cash/Bank Account,现金/银行账户
Casual Leave,事假
@@ -620,7 +620,7 @@
Contacts,往来
Content,内容
Content Type,内容类型
-Contra Voucher,魂斗罗券
+Contra Entry,魂斗罗券
Contract,合同
Contract End Date,合同结束日期
Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
@@ -651,7 +651,7 @@
Country Name,国家名称
Country wise default Address Templates,国家明智的默认地址模板
"Country, Timezone and Currency",国家，时区和货币
-Create Bank Voucher for the total salary paid for the above selected criteria,创建银行券为支付上述选择的标准工资总额
+Create Bank Entry for the total salary paid for the above selected criteria,创建银行券为支付上述选择的标准工资总额
Create Customer,创建客户
Create Material Requests,创建材料要求
Create New,创建新
@@ -673,7 +673,7 @@
Credit,信用
Credit Amt,信用额
Credit Card,信用卡
-Credit Card Voucher,信用卡券
+Credit Card Entry,信用卡券
Credit Controller,信用控制器
Credit Days,信贷天
Credit Limit,信用额度
@@ -1009,7 +1009,7 @@
Excise Duty Edu Cess 2,消费税埃杜塞斯2
Excise Duty SHE Cess 1,消费税佘塞斯1
Excise Page Number,消费页码
-Excise Voucher,消费券
+Excise Entry,消费券
Execution,执行
Executive Search,猎头
Exemption Limit,免税限额
@@ -1357,7 +1357,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,发票期间由发票日期为日期必须在经常性发票
Invoice Period To,发票的日期要
Invoice Type,发票类型
-Invoice/Journal Voucher Details,发票/日记帐凭证详细信息
+Invoice/Journal Entry Details,发票/日记帐凭证详细信息
Invoiced Amount (Exculsive Tax),发票金额（Exculsive税）
Is Active,为活跃
Is Advance,为进
@@ -1489,11 +1489,11 @@
Jobs Email Settings,乔布斯邮件设置
Journal Entries,日记帐分录
Journal Entry,日记帐分录
-Journal Voucher,期刊券
+Journal Entry,期刊券
Journal Entry Account,日记帐凭证详细信息
Journal Entry Account No,日记帐凭证详细说明暂无
-Journal Voucher {0} does not have account {1} or already matched,记账凭单{0}没有帐号{1}或已经匹配
-Journal Vouchers {0} are un-linked,日记帐凭单{0}被取消链接
+Journal Entry {0} does not have account {1} or already matched,记账凭单{0}没有帐号{1}或已经匹配
+Journal Entries {0} are un-linked,日记帐凭单{0}被取消链接
Keep a track of communication related to this enquiry which will help for future reference.,保持跟踪的沟通与此相关的调查，这将有助于以供将来参考。
Keep it web friendly 900px (w) by 100px (h),保持它的Web友好900px （宽）x 100像素（高）
Key Performance Area,关键绩效区
@@ -1608,7 +1608,7 @@
Major/Optional Subjects,大/选修课
Make ,使
Make Accounting Entry For Every Stock Movement,做会计分录为每股份转移
-Make Bank Voucher,使银行券
+Make Bank Entry,使银行券
Make Credit Note,使信贷注
Make Debit Note,让缴费单
Make Delivery,使交货
@@ -3144,7 +3144,7 @@
Update Series Number,更新序列号
Update Stock,库存更新
Update bank payment dates with journals.,更新与期刊银行付款日期。
-Update clearance date of Journal Entries marked as 'Bank Vouchers',你不能同时输入送货单号及销售发票编号请输入任何一个。
+Update clearance date of Journal Entries marked as 'Bank Entry',你不能同时输入送货单号及销售发票编号请输入任何一个。
Updated,更新
Updated Birthday Reminders,更新生日提醒
Upload Attendance,上传出席
@@ -3282,7 +3282,7 @@
Write Off Based On,核销的基础上
Write Off Cost Center,冲销成本中心
Write Off Outstanding Amount,核销额（亿元）
-Write Off Voucher,核销券
+Write Off Entry,核销券
Wrong Template: Unable to find head row.,错误的模板：找不到头排。
Year,年
Year Closed,年度关闭
@@ -3300,7 +3300,7 @@
You can enter the minimum quantity of this item to be ordered.,您可以输入资料到订购的最小数量。
You can not change rate if BOM mentioned agianst any item,你不能改变速度，如果BOM中提到反对的任何项目
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,请输入仓库的材料要求将提高
-You can not enter current voucher in 'Against Journal Voucher' column,“反对日记帐凭证”列中您不能输入电流券
+You can not enter current voucher in 'Against Journal Entry' column,“反对日记帐凭证”列中您不能输入电流券
You can set Default Bank Account in Company master,您可以在公司主设置默认银行账户
You can start by selecting backup frequency and granting access for sync,您可以通过选择备份的频率和授权访问的同步启动
You can submit this Stock Reconciliation.,您可以提交该股票对账。
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 92936a4..c1589d2 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -178,8 +178,8 @@
Against Document No,對文件無
Against Expense Account,對費用帳戶
Against Income Account,對收入賬戶
-Against Journal Voucher,對日記帳憑證
-Against Journal Voucher {0} does not have any unmatched {1} entry,對日記帳憑證{0}沒有任何無可比擬{1}項目
+Against Journal Entry,對日記帳憑證
+Against Journal Entry {0} does not have any unmatched {1} entry,對日記帳憑證{0}沒有任何無可比擬{1}項目
Against Purchase Invoice,對採購發票
Against Sales Invoice,對銷售發票
Against Sales Order,對銷售訂單
@@ -361,7 +361,7 @@
Bank Reconciliation,銀行對帳
Bank Reconciliation Detail,銀行對帳詳細
Bank Reconciliation Statement,銀行對帳表
-Bank Voucher,銀行券
+Bank Entry,銀行券
Bank/Cash Balance,銀行/現金結餘
Banking,銀行業
Barcode,條碼
@@ -496,7 +496,7 @@
Case No. cannot be 0,案號不能為0
Cash,現金
Cash In Hand,手頭現金
-Cash Voucher,現金券
+Cash Entry,現金券
Cash or Bank Account is mandatory for making payment entry,現金或銀行帳戶是強制性的付款項
Cash/Bank Account,現金/銀行賬戶
Casual Leave,事假
@@ -620,7 +620,7 @@
Contacts,往來
Content,內容
Content Type,內容類型
-Contra Voucher,魂斗羅券
+Contra Entry,魂斗羅券
Contract,合同
Contract End Date,合同結束日期
Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
@@ -651,7 +651,7 @@
Country Name,國家名稱
Country wise default Address Templates,國家明智的默認地址模板
"Country, Timezone and Currency",國家，時區和貨幣
-Create Bank Voucher for the total salary paid for the above selected criteria,創建銀行券為支付上述選擇的標準工資總額
+Create Bank Entry for the total salary paid for the above selected criteria,創建銀行券為支付上述選擇的標準工資總額
Create Customer,創建客戶
Create Material Requests,創建材料要求
Create New,創建新
@@ -673,7 +673,7 @@
Credit,信用
Credit Amt,信用額
Credit Card,信用卡
-Credit Card Voucher,信用卡券
+Credit Card Entry,信用卡券
Credit Controller,信用控制器
Credit Days,信貸天
Credit Limit,信用額度
@@ -1009,7 +1009,7 @@
Excise Duty Edu Cess 2,消費稅埃杜塞斯2
Excise Duty SHE Cess 1,消費稅佘塞斯1
Excise Page Number,消費頁碼
-Excise Voucher,消費券
+Excise Entry,消費券
Execution,執行
Executive Search,獵頭
Exemption Limit,免稅限額
@@ -1357,7 +1357,7 @@
Invoice Period From and Invoice Period To dates mandatory for recurring invoice,發票期間由發票日期為日期必須在經常性發票
Invoice Period To,發票的日期要
Invoice Type,發票類型
-Invoice/Journal Voucher Details,發票/日記帳憑證詳細信息
+Invoice/Journal Entry Details,發票/日記帳憑證詳細信息
Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
Is Active,為活躍
Is Advance,為進
@@ -1489,11 +1489,11 @@
Jobs Email Settings,喬布斯郵件設置
Journal Entries,日記帳分錄
Journal Entry,日記帳分錄
-Journal Voucher,期刊券
+Journal Entry,期刊券
Journal Entry Account,日記帳憑證詳細信息
Journal Entry Account No,日記帳憑證詳細說明暫無
-Journal Voucher {0} does not have account {1} or already matched,記賬憑單{0}沒有帳號{1}或已經匹配
-Journal Vouchers {0} are un-linked,日記帳憑單{0}被取消鏈接
+Journal Entry {0} does not have account {1} or already matched,記賬憑單{0}沒有帳號{1}或已經匹配
+Journal Entries {0} are un-linked,日記帳憑單{0}被取消鏈接
Keep a track of communication related to this enquiry which will help for future reference.,保持跟踪的溝通與此相關的調查，這將有助於以供將來參考。
Keep it web friendly 900px (w) by 100px (h),保持它的Web友好900px （寬）x 100像素（高）
Key Performance Area,關鍵績效區
@@ -1608,7 +1608,7 @@
Major/Optional Subjects,大/選修課
Make ,使
Make Accounting Entry For Every Stock Movement,做會計分錄為每股份轉移
-Make Bank Voucher,使銀行券
+Make Bank Entry,使銀行券
Make Credit Note,使信貸注
Make Debit Note,讓繳費單
Make Delivery,使交貨
@@ -3144,7 +3144,7 @@
Update Series Number,更新序列號
Update Stock,庫存更新
Update bank payment dates with journals.,更新與期刊銀行付款日期。
-Update clearance date of Journal Entries marked as 'Bank Vouchers',你不能同時輸入送貨單號及銷售發票編號請輸入任何一個。
+Update clearance date of Journal Entries marked as 'Bank Entry',你不能同時輸入送貨單號及銷售發票編號請輸入任何一個。
Updated,更新
Updated Birthday Reminders,更新生日提醒
Upload Attendance,上傳出席
@@ -3282,7 +3282,7 @@
Write Off Based On,核銷的基礎上
Write Off Cost Center,沖銷成本中心
Write Off Outstanding Amount,核銷額（億元）
-Write Off Voucher,核銷券
+Write Off Entry,核銷券
Wrong Template: Unable to find head row.,錯誤的模板：找不到頭排。
Year,年
Year Closed,年度關閉
@@ -3300,7 +3300,7 @@
You can enter the minimum quantity of this item to be ordered.,您可以輸入資料到訂購的最小數量。
You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,請輸入倉庫的材料要求將提高
-You can not enter current voucher in 'Against Journal Voucher' column,“反對日記帳憑證”列中您不能輸入電流券
+You can not enter current voucher in 'Against Journal Entry' column,“反對日記帳憑證”列中您不能輸入電流券
You can set Default Bank Account in Company master,您可以在公司主設置默認銀行賬戶
You can start by selecting backup frequency and granting access for sync,您可以通過選擇備份的頻率和授權訪問的同步啟動
You can submit this Stock Reconciliation.,您可以提交該股票對賬。