Merge pull request #8263 from frappe/revert-8126-issue8094
Revert "Add link field Package Code (fixes #8094)"
diff --git a/README.md b/README.md
index 4f59339..2a813cf 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,14 @@
---
+## Contributing
+
+1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Pull-Request-Guidelines)
+1. [Translations](https://translate.erpnext.com)
+1. [Chart of Accounts](https://charts.erpnext.com)
+
+---
+
## Logo and Trademark
The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ce9a142..2df9354 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '8.0.3'
+__version__ = '8.0.10'
def get_default_company(user=None):
'''Get default company for user'''
@@ -25,6 +25,14 @@
if company:
return frappe.db.get_value('Company', company, 'default_currency')
+def get_company_currency(company):
+ '''Returns the default company currency'''
+ if not frappe.flags.company_currency:
+ frappe.flags.company_currency = {}
+ if not company in frappe.flags.company_currency:
+ frappe.flags.company_currency[company] = frappe.db.get_value('Company', company, 'default_currency')
+ return frappe.flags.company_currency[company]
+
def set_perpetual_inventory(enable=1):
accounts_settings = frappe.get_doc("Accounts Settings")
accounts_settings.auto_accounting_for_stock = enable
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index ce60298..304af37 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -2,13 +2,12 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
from frappe import _
from frappe.utils import flt, fmt_money, getdate, formatdate
from frappe.model.document import Document
from erpnext.accounts.party import validate_party_gle_currency, validate_party_frozen_disabled
from erpnext.accounts.utils import get_account_currency
-from erpnext.setup.doctype.company.company import get_company_currency
from erpnext.accounts.utils import get_fiscal_year
from erpnext.exceptions import InvalidAccountCurrency
@@ -19,7 +18,7 @@
self.flags.ignore_submit_comment = True
self.check_mandatory()
self.validate_and_set_fiscal_year()
-
+
if not self.flags.from_repost:
self.pl_must_have_cost_center()
self.check_pl_account()
@@ -32,7 +31,7 @@
if not from_repost:
self.validate_account_details(adv_adj)
check_freezing_date(self.posting_date, adv_adj)
-
+
validate_frozen_account(self.account, adv_adj)
validate_balance_type(self.account, adv_adj)
@@ -56,7 +55,7 @@
elif account_type == "Payable":
frappe.throw(_("{0} {1}: Supplier is required against Payable account {2}")
.format(self.voucher_type, self.voucher_no, self.account))
-
+
# Zero value transaction is not allowed
if not (flt(self.debit) or flt(self.credit)):
frappe.throw(_("{0} {1}: Either debit or credit amount is required for {2}")
@@ -116,7 +115,7 @@
validate_party_frozen_disabled(self.party_type, self.party)
def validate_currency(self):
- company_currency = get_company_currency(self.company)
+ company_currency = erpnext.get_company_currency(self.company)
account_currency = get_account_currency(self.account)
if not self.account_currency:
@@ -124,7 +123,7 @@
if account_currency != self.account_currency:
frappe.throw(_("{0} {1}: Accounting Entry for {2} can only be made in currency: {3}")
- .format(self.voucher_type, self.voucher_no, self.account,
+ .format(self.voucher_type, self.voucher_no, self.account,
(account_currency or company_currency)), InvalidAccountCurrency)
if self.party_type and self.party:
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index deb252c..fb93121 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 0,
"autoname": "naming_series:",
@@ -1325,19 +1326,19 @@
"unique": 0
}
],
+ "has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-file-text",
"idx": 176,
"image_view": 0,
"in_create": 0,
- "in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-02-17 16:17:48.991851",
+ "modified": "2017-04-10 12:07:44.599804",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Entry",
@@ -1412,6 +1413,6 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 06724b1..a471c48 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -2,12 +2,11 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe, json
+import frappe, erpnext, json
from frappe.utils import cstr, flt, fmt_money, formatdate
from frappe import msgprint, _, scrub
from erpnext.controllers.accounts_controller import AccountsController
from erpnext.accounts.utils import get_balance_on, get_account_currency
-from erpnext.setup.utils import get_company_currency
from erpnext.accounts.party import get_party_account
from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
from erpnext.hr.doctype.employee_loan.employee_loan import update_disbursement_status
@@ -325,11 +324,11 @@
if d.account_currency == self.company_currency:
d.exchange_rate = 1
elif not d.exchange_rate or d.exchange_rate == 1 or \
- (d.reference_type in ("Sales Invoice", "Purchase Invoice")
+ (d.reference_type in ("Sales Invoice", "Purchase Invoice")
and d.reference_name and self.posting_date):
-
+
# Modified to include the posting date for which to retreive the exchange rate
- d.exchange_rate = get_exchange_rate(self.posting_date, d.account, d.account_currency,
+ d.exchange_rate = get_exchange_rate(self.posting_date, d.account, d.account_currency,
self.company, d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
if not d.exchange_rate:
@@ -656,7 +655,7 @@
if args.get("party_account"):
# Modified to include the posting date for which the exchange rate is required.
# Assumed to be the posting date in the reference document
- exchange_rate = get_exchange_rate(ref_doc.get("posting_date") or ref_doc.get("transaction_date"),
+ exchange_rate = get_exchange_rate(ref_doc.get("posting_date") or ref_doc.get("transaction_date"),
args.get("party_account"), args.get("party_account_currency"),
ref_doc.company, ref_doc.doctype, ref_doc.name)
@@ -692,8 +691,8 @@
bank_row.update(bank_account)
# Modified to include the posting date for which the exchange rate is required.
# Assumed to be the posting date of the reference date
- bank_row.exchange_rate = get_exchange_rate(ref_doc.get("posting_date")
- or ref_doc.get("transaction_date"), bank_account["account"],
+ bank_row.exchange_rate = get_exchange_rate(ref_doc.get("posting_date")
+ or ref_doc.get("transaction_date"), bank_account["account"],
bank_account["account_currency"], ref_doc.company)
bank_row.cost_center = cost_center
@@ -746,7 +745,7 @@
if isinstance(args, basestring):
args = json.loads(args)
- company_currency = get_company_currency(args.get("company"))
+ company_currency = erpnext.get_company_currency(args.get("company"))
if args.get("doctype") == "Journal Entry":
condition = " and party=%(party)s" if args.get("party") else ""
@@ -805,7 +804,7 @@
if not frappe.has_permission("Account"):
frappe.msgprint(_("No Permission"), raise_exception=1)
- company_currency = get_company_currency(company)
+ company_currency = erpnext.get_company_currency(company)
account_details = frappe.db.get_value("Account", account, ["account_type", "account_currency"], as_dict=1)
if not account_details:
@@ -853,7 +852,7 @@
if not account_currency:
account_currency = account_details.account_currency
- company_currency = get_company_currency(company)
+ company_currency = erpnext.get_company_currency(company)
if account_currency != company_currency:
if reference_type in ("Sales Invoice", "Purchase Invoice") and reference_name:
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 7fac377..7c6ed84 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -1675,7 +1675,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-03-14 17:12:48.816644",
+ "modified": "2017-04-10 12:06:22.176045",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry",
@@ -1730,6 +1730,6 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 6ee9e66..3762b48 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -2,8 +2,7 @@
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext.accounts");
-{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
-
+{% include 'erpnext/public/js/controllers/buying.js' %};
erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
setup: function(doc) {
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 26c4fa9..6b97cdb 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -3646,7 +3646,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-03-15 14:29:51.957287",
+ "modified": "2017-04-10 12:05:28.082020",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
@@ -3762,6 +3762,6 @@
"sort_order": "DESC",
"timeline_field": "supplier",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index dd3b4ba..4d58f98 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -2,10 +2,9 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
from frappe.utils import cint, formatdate, flt, getdate
from frappe import _, throw
-from erpnext.setup.utils import get_company_currency
import frappe.defaults
from erpnext.controllers.buying_controller import BuyingController
@@ -15,6 +14,7 @@
from erpnext.controllers.stock_controller import get_warehouse_account
from erpnext.accounts.general_ledger import make_gl_entries, merge_similar_entries, delete_gl_entries
from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
+from erpnext.buying.utils import check_for_closed_status
form_grid_templates = {
"items": "templates/form_grid/item_grid.html"
@@ -93,7 +93,7 @@
super(PurchaseInvoice, self).set_missing_values(for_validate)
def check_conversion_rate(self):
- default_currency = get_company_currency(self.company)
+ default_currency = erpnext.get_company_currency(self.company)
if not default_currency:
throw(_('Please enter default currency in Company Master'))
if (self.currency == default_currency and flt(self.conversion_rate) != 1.00) or not self.conversion_rate or (self.currency != default_currency and flt(self.conversion_rate) == 1.00):
@@ -113,12 +113,11 @@
def check_for_closed_status(self):
check_list = []
- pc_obj = frappe.get_doc('Purchase Common')
for d in self.get('items'):
if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt:
check_list.append(d.purchase_order)
- pc_obj.check_for_closed_status('Purchase Order', d.purchase_order)
+ check_for_closed_status('Purchase Order', d.purchase_order)
def validate_with_previous_doc(self):
super(PurchaseInvoice, self).validate_with_previous_doc({
@@ -629,10 +628,12 @@
pi = frappe.db.sql('''select name from `tabPurchase Invoice`
where
bill_no = %(bill_no)s
+ and supplier = %(supplier)s
and name != %(name)s
and docstatus < 2
and posting_date between %(year_start_date)s and %(year_end_date)s''', {
"bill_no": self.bill_no,
+ "supplier": self.supplier,
"name": self.name,
"year_start_date": fiscal_year.year_start_date,
"year_end_date": fiscal_year.year_end_date
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 6102d3e..a96446f 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"autoname": "hash",
@@ -340,6 +341,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock UOM",
+ "length": 0,
+ "no_copy": 0,
+ "options": "UOM",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "col_break2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -424,6 +455,35 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "stock_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "sec_break1",
"fieldtype": "Section Break",
"hidden": 0,
@@ -1869,17 +1929,17 @@
"unique": 0
}
],
+ "has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 1,
"image_view": 0,
"in_create": 0,
- "in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2017-02-17 16:28:26.719053",
+ "modified": "2017-04-11 13:44:17.460674",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 59766bd..419c557 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -182,6 +182,7 @@
address_data = address[0]
address_data.update({'full_name': data.customer_name})
customer_address[data.name] = address_data
+
return customer_address
def get_child_nodes(group_type, root):
@@ -295,9 +296,9 @@
if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
validate_records(doc)
si_doc = frappe.new_doc('Sales Invoice')
- si_doc.due_date = doc.get('posting_date')
si_doc.offline_pos_name = name
si_doc.update(doc)
+ si_doc.due_date = doc.get('posting_date')
submit_invoice(si_doc, name, doc)
name_list.append(name)
else:
@@ -337,11 +338,14 @@
def make_address(args, customer):
if not args.get('address_line1'): return
- name = args.get('name') or get_customers_address(customer)[customer].get("name")
+ name = args.get('name')
+
+ if not name:
+ data = get_customers_address(customer)
+ name = data[customer].get('name') if data else None
if name:
- address = frappe.get_doc('Address', name)
- frappe.errprint(address)
+ address = frappe.get_doc('Address', name)
else:
address = frappe.new_doc('Address')
address.country = frappe.db.get_value('Company', args.get('company'), 'country')
@@ -400,4 +404,5 @@
if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
si_doc.docstatus = 0
si_doc.flags.ignore_mandatory = True
+ si_doc.due_date = si_doc.posting_date
si_doc.insert()
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index df2f34d..c255f13 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -7,7 +7,7 @@
"beta": 0,
"creation": "2013-05-24 19:29:05",
"custom": 0,
- "default_print_format": "Sample Print",
+ "default_print_format": "",
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
@@ -4417,8 +4417,8 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-03-29 05:09:56.656338",
- "modified_by": "Administrator",
+ "modified": "2017-04-12 15:11:45.931485",
+ "modified_by": "faris@erpnext.com",
"module": "Accounts",
"name": "Sales Invoice",
"owner": "Administrator",
@@ -4513,6 +4513,6 @@
"sort_order": "DESC",
"timeline_field": "customer",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
index 80e4fb7..7faaf11 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
@@ -4,11 +4,10 @@
# For license information, please see license.txt
from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
from frappe import _, msgprint, throw
from frappe.utils import flt, fmt_money
from frappe.model.document import Document
-from erpnext.setup.utils import get_company_currency
class OverlappingConditionError(frappe.ValidationError): pass
class FromGreaterThanToError(frappe.ValidationError): pass
@@ -77,7 +76,7 @@
overlaps.append([d1, d2])
if overlaps:
- company_currency = get_company_currency(self.company)
+ company_currency = erpnext.get_company_currency(self.company)
msgprint(_("Overlapping conditions found between:"))
messages = []
for d1, d2 in overlaps:
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 8aedf78..f0c29bc 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -151,13 +151,6 @@
}
return out
-def get_company_currency():
- company_currency = frappe._dict()
- for d in frappe.get_all("Company", fields=["name", "default_currency"]):
- company_currency.setdefault(d.name, d.default_currency)
-
- return company_currency
-
@frappe.whitelist()
def get_party_account(party_type, party, company):
"""Returns the account for the given `party`.
@@ -348,7 +341,7 @@
elif party_type == "Employee":
if frappe.db.get_value("Employee", party_name, "status") == "Left":
- frappe.msgprint(_("{0} {1} is not active").format(party_type, party_name), PartyDisabled, alert=True)
+ frappe.msgprint(_("{0} {1} is not active").format(party_type, party_name), alert=True)
def get_timeline_data(doctype, name):
'''returns timeline data for the past one year'''
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index d09ac70..5d1aabe 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -66,7 +66,8 @@
if gle_currency:
account_currency = gle_currency
else:
- account_currency = frappe.db.get_value(filters.party_type, filters.party, "default_currency")
+ account_currency = None if filters.party_type == "Employee" else \
+ frappe.db.get_value(filters.party_type, filters.party, "default_currency")
filters["account_currency"] = account_currency or filters.company_currency
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 48c6d9a..4b28f1f 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -12,7 +12,7 @@
def execute(filters=None):
if not filters: filters = frappe._dict()
- company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+ filters.currency = frappe.db.get_value("Company", filters.company, "default_currency")
gross_profit_data = GrossProfitGenerator(filters)
@@ -50,7 +50,7 @@
for col in group_wise_columns.get(scrub(filters.group_by)):
row.append(src.get(col))
- row.append(company_currency)
+ row.append(filters.currency)
data.append(row)
return columns, data
@@ -218,14 +218,18 @@
def get_average_buying_rate(self, row, item_code):
if not item_code in self.average_buying_rate:
if item_code in self.non_stock_items:
- self.average_buying_rate[item_code] = flt(frappe.db.sql("""select sum(base_net_amount) / sum(qty * conversion_factor)
+ self.average_buying_rate[item_code] = flt(frappe.db.sql("""
+ select sum(base_net_amount) / sum(qty * conversion_factor)
from `tabPurchase Invoice Item`
where item_code = %s and docstatus=1""", item_code)[0][0])
else:
average_buying_rate = get_incoming_rate(row)
if not average_buying_rate:
- average_buying_rate = get_valuation_rate(item_code, row.warehouse, allow_zero_rate=True)
- self.average_buying_rate[item_code] = average_buying_rate
+ average_buying_rate = get_valuation_rate(item_code, row.warehouse,
+ row.parenttype, row.parent, allow_zero_rate=True,
+ currency=self.filters.currency)
+
+ self.average_buying_rate[item_code] = flt(average_buying_rate)
return self.average_buying_rate[item_code]
@@ -235,7 +239,7 @@
select (a.base_rate / a.conversion_factor)
from `tabPurchase Invoice Item` a
where a.item_code = %s and a.docstatus=1
- and modified <= %s
+ and modified <= %s
order by a.modified desc limit 1""", (item_code,self.filters.to_date))
else:
last_purchase_rate = frappe.db.sql("""
@@ -253,7 +257,7 @@
conditions += " and posting_date >= %(from_date)s"
if self.filters.to_date:
conditions += " and posting_date <= %(to_date)s"
-
+
if self.filters.group_by=="Sales Person":
sales_person_cols = ", sales.sales_person, sales.allocated_amount, sales.incentives"
sales_team_table = "left join `tabSales Team` sales on sales.parent = `tabSales Invoice`.name"
@@ -269,7 +273,7 @@
`tabSales Invoice Item`.dn_detail, `tabSales Invoice Item`.delivery_note, `tabSales Invoice Item`.stock_qty as qty,
`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount, `tabSales Invoice Item`.name as "item_row"
{sales_person_cols}
- from
+ from
`tabSales Invoice`
inner join `tabSales Invoice Item` on `tabSales Invoice Item`.parent = `tabSales Invoice`.name
{sales_team_table}
@@ -277,7 +281,7 @@
`tabSales Invoice`.docstatus = 1 and `tabSales Invoice`.is_return != 1 {conditions} {match_cond}
order by
`tabSales Invoice`.posting_date desc, `tabSales Invoice`.posting_time desc"""
- .format(conditions=conditions, sales_person_cols=sales_person_cols,
+ .format(conditions=conditions, sales_person_cols=sales_person_cols,
sales_team_table=sales_team_table, match_cond = get_match_cond('Sales Invoice')), self.filters, as_dict=1)
def load_stock_ledger_entries(self):
diff --git a/erpnext/buying/doctype/purchase_common/README.md b/erpnext/buying/doctype/purchase_common/README.md
deleted file mode 100644
index bedec2a..0000000
--- a/erpnext/buying/doctype/purchase_common/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Common scripts for purchase transactions.
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_common/__init__.py b/erpnext/buying/doctype/purchase_common/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/buying/doctype/purchase_common/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.json b/erpnext/buying/doctype/purchase_common/purchase_common.json
deleted file mode 100644
index fd08d08..0000000
--- a/erpnext/buying/doctype/purchase_common/purchase_common.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "creation": "2012-03-27 14:35:51",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "fields": [],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "modified": "2013-12-20 19:23:27",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Purchase Common",
- "owner": "Administrator",
- "permissions": [],
- "read_only": 0,
- "read_only_onload": 0
-}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py
deleted file mode 100644
index 844a655..0000000
--- a/erpnext/buying/doctype/purchase_common/purchase_common.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe, json
-from frappe.utils import flt, cstr, cint
-from frappe import _
-
-from erpnext.stock.doctype.item.item import get_last_purchase_details
-from erpnext.controllers.buying_controller import BuyingController
-
-class PurchaseCommon(BuyingController):
- def update_last_purchase_rate(self, obj, is_submit):
- """updates last_purchase_rate in item table for each item"""
-
- import frappe.utils
- this_purchase_date = frappe.utils.getdate(obj.get('posting_date') or obj.get('transaction_date'))
-
- for d in obj.get("items"):
- # get last purchase details
- last_purchase_details = get_last_purchase_details(d.item_code, obj.name)
-
- # compare last purchase date and this transaction's date
- last_purchase_rate = None
- if last_purchase_details and \
- (last_purchase_details.purchase_date > this_purchase_date):
- last_purchase_rate = last_purchase_details['base_rate']
- elif is_submit == 1:
- # even if this transaction is the latest one, it should be submitted
- # for it to be considered for latest purchase rate
- if flt(d.conversion_factor):
- last_purchase_rate = flt(d.base_rate) / flt(d.conversion_factor)
- else:
- frappe.throw(_("UOM Conversion factor is required in row {0}").format(d.idx))
-
- # update last purchsae rate
- if last_purchase_rate:
- frappe.db.sql("""update `tabItem` set last_purchase_rate = %s where name = %s""",
- (flt(last_purchase_rate), d.item_code))
-
- def validate_for_items(self, obj):
- items = []
- for d in obj.get("items"):
- if not d.qty:
- if obj.doctype == "Purchase Receipt" and d.rejected_qty:
- continue
- frappe.throw(_("Please enter quantity for Item {0}").format(d.item_code))
-
- # udpate with latest quantities
- bin = frappe.db.sql("""select projected_qty from `tabBin` where
- item_code = %s and warehouse = %s""", (d.item_code, d.warehouse), as_dict=1)
-
- f_lst ={'projected_qty': bin and flt(bin[0]['projected_qty']) or 0, 'ordered_qty': 0, 'received_qty' : 0}
- if d.doctype in ('Purchase Receipt Item', 'Purchase Invoice Item'):
- f_lst.pop('received_qty')
- for x in f_lst :
- if d.meta.get_field(x):
- d.set(x, f_lst[x])
-
- item = frappe.db.sql("""select is_stock_item,
- is_sub_contracted_item, end_of_life, disabled from `tabItem` where name=%s""",
- d.item_code, as_dict=1)[0]
-
- from erpnext.stock.doctype.item.item import validate_end_of_life
- validate_end_of_life(d.item_code, item.end_of_life, item.disabled)
-
- # validate stock item
- if item.is_stock_item==1 and d.qty and not d.warehouse and not d.delivered_by_supplier:
- frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx))
-
- items.append(cstr(d.item_code))
-
- if items and len(items) != len(set(items)) and \
- not cint(frappe.db.get_single_value("Buying Settings", "allow_multiple_items") or 0):
- frappe.throw(_("Same item cannot be entered multiple times."))
-
- def check_for_closed_status(self, doctype, docname):
- status = frappe.db.get_value(doctype, docname, "status")
-
- if status == "Closed":
- frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
-
-@frappe.whitelist()
-def get_linked_material_requests(items):
- items = json.loads(items)
- mr_list = []
- for item in items:
- material_request = frappe.db.sql("""SELECT distinct mr.name AS mr_name,
- (mr_item.qty - mr_item.ordered_qty) AS qty,
- mr_item.item_code AS item_code,
- mr_item.name AS mr_item
- FROM `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
- WHERE mr.name = mr_item.parent
- AND mr_item.item_code = %(item)s
- AND mr.material_request_type = 'Purchase'
- AND mr.per_ordered < 99.99
- AND mr.docstatus = 1
- AND mr.status != 'Stopped'
- ORDER BY mr_item.item_code ASC""",{"item": item}, as_dict=1)
- if material_request:
- mr_list.append(material_request)
-
- return mr_list
-
-
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 5b16cd6..85a6329 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -3,7 +3,7 @@
frappe.provide("erpnext.buying");
-{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/public/js/controllers/buying.js' %};
frappe.ui.form.on("Purchase Order", {
setup: function(frm) {
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 796e0f2..96351e3 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -11,6 +11,8 @@
from erpnext.stock.doctype.item.item import get_last_purchase_details
from erpnext.stock.stock_balance import update_bin_qty, get_ordered_qty
from frappe.desk.notifications import clear_doctype_notifications
+from erpnext.buying.utils import (validate_for_items, check_for_closed_status,
+ update_last_purchase_rate)
form_grid_templates = {
@@ -37,9 +39,8 @@
super(PurchaseOrder, self).validate()
self.set_status()
- pc_obj = frappe.get_doc('Purchase Common')
- pc_obj.validate_for_items(self)
- self.check_for_closed_status(pc_obj)
+ validate_for_items(self)
+ self.check_for_closed_status()
self.validate_uom_is_integer("uom", "qty")
self.validate_uom_is_integer("stock_uom", ["qty", "required_qty"])
@@ -111,12 +112,12 @@
= d.rate = item_last_purchase_rate
# Check for Closed status
- def check_for_closed_status(self, pc_obj):
+ def check_for_closed_status(self):
check_list =[]
for d in self.get('items'):
if d.meta.get_field('material_request') and d.material_request and d.material_request not in check_list:
check_list.append(d.material_request)
- pc_obj.check_for_closed_status('Material Request', d.material_request)
+ check_for_closed_status('Material Request', d.material_request)
def update_requested_qty(self):
material_request_map = {}
@@ -155,7 +156,7 @@
if date_diff and date_diff[0][0]:
msgprint(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name),
raise_exception=True)
-
+
def update_status(self, status):
self.check_modified_date()
self.set_status(update=True, status=status)
@@ -168,8 +169,6 @@
if self.is_against_so():
self.update_status_updater()
- purchase_controller = frappe.get_doc("Purchase Common")
-
self.update_prevdoc_status()
self.update_requested_qty()
self.update_ordered_qty()
@@ -177,7 +176,7 @@
frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype,
self.company, self.base_grand_total)
- purchase_controller.update_last_purchase_rate(self, is_submit = 1)
+ update_last_purchase_rate(self, is_submit = 1)
def on_cancel(self):
if self.is_against_so():
@@ -186,8 +185,7 @@
if self.has_drop_ship_item():
self.update_delivered_qty_in_sales_order()
- pc_obj = frappe.get_doc('Purchase Common')
- self.check_for_closed_status(pc_obj)
+ self.check_for_closed_status()
frappe.db.set(self,'status','Cancelled')
@@ -197,7 +195,7 @@
self.update_requested_qty()
self.update_ordered_qty()
- pc_obj.update_last_purchase_rate(self, is_submit = 0)
+ update_last_purchase_rate(self, is_submit = 0)
def on_update(self):
pass
@@ -303,7 +301,7 @@
target.amount = flt(obj.amount) - flt(obj.billed_amt)
target.base_amount = target.amount * flt(source_parent.conversion_rate)
target.qty = target.amount / flt(obj.rate) if (flt(obj.rate) and flt(obj.billed_amt)) else flt(obj.qty)
-
+
item = frappe.db.get_value("Item", target.item_code, ["item_group", "buying_cost_center"], as_dict=1)
target.cost_center = frappe.db.get_value("Project", obj.project, "cost_center") \
or item.buying_cost_center \
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
index 59ad092..92600b7 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/public/js/controllers/buying.js' %};
cur_frm.add_fetch('contact', 'email_id', 'email_id')
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index ab9efae..9109239 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -14,13 +14,14 @@
from erpnext.accounts.party import get_party_account_currency, get_party_details
from erpnext.stock.doctype.material_request.material_request import set_missing_values
from erpnext.controllers.buying_controller import BuyingController
+from erpnext.buying.utils import validate_for_items
STANDARD_USERS = ("Guest", "Administrator")
class RequestforQuotation(BuyingController):
def validate(self):
self.validate_duplicate_supplier()
- self.validate_common()
+ validate_for_items(self)
self.update_email_id()
def validate_duplicate_supplier(self):
@@ -28,10 +29,6 @@
if len(supplier_list) != len(set(supplier_list)):
frappe.throw(_("Same supplier has been entered multiple times"))
- def validate_common(self):
- pc = frappe.get_doc('Purchase Common')
- pc.validate_for_items(self)
-
def update_email_id(self):
for rfq_supplier in self.suppliers:
if not rfq_supplier.email_id:
@@ -130,7 +127,7 @@
self.send_email(data, sender, subject, message, attachments)
def send_email(self, data, sender, subject, message, attachments):
- make(subject = subject, content=message,recipients=data.email_id,
+ make(subject = subject, content=message,recipients=data.email_id,
sender=sender,attachments = attachments, send_email=True,
doctype=self.doctype, name=self.name)["name"]
@@ -250,26 +247,26 @@
args = doc.get('suppliers')[cint(supplier_idx) - 1]
doc.update_supplier_part_no(args)
return doc
-
+
@frappe.whitelist()
def get_item_from_material_requests_based_on_supplier(source_name, target_doc = None):
mr_items_list = frappe.db.sql("""
SELECT
mr.name, mr_item.item_code
FROM
- `tabItem` as item,
- `tabItem Supplier` as item_supp,
- `tabMaterial Request Item` as mr_item,
- `tabMaterial Request` as mr
- WHERE item_supp.supplier = %(supplier)s
- AND item.name = item_supp.parent
- AND mr_item.parent = mr.name
- AND mr_item.item_code = item.name
- AND mr.status != "Stopped"
- AND mr.material_request_type = "Purchase"
- AND mr.docstatus = 1
+ `tabItem` as item,
+ `tabItem Supplier` as item_supp,
+ `tabMaterial Request Item` as mr_item,
+ `tabMaterial Request` as mr
+ WHERE item_supp.supplier = %(supplier)s
+ AND item.name = item_supp.parent
+ AND mr_item.parent = mr.name
+ AND mr_item.item_code = item.name
+ AND mr.status != "Stopped"
+ AND mr.material_request_type = "Purchase"
+ AND mr.docstatus = 1
AND mr.per_ordered < 99.99""", {"supplier": source_name}, as_dict=1)
-
+
material_requests = {}
for d in mr_items_list:
material_requests.setdefault(d.name, []).append(d.item_code)
@@ -293,5 +290,5 @@
]
}
}, target_doc)
-
+
return target_doc
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index 5ed210c..1e2379e 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
// attach required files
-{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/public/js/controllers/buying.js' %};
frappe.ui.form.on('Suppier Quotation', {
setup: function() {
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index 30899c8..1cb5a18 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -8,6 +8,7 @@
from frappe.model.mapper import get_mapped_doc
from erpnext.controllers.buying_controller import BuyingController
+from erpnext.buying.utils import validate_for_items
form_grid_templates = {
"items": "templates/form_grid/item_grid.html"
@@ -24,7 +25,7 @@
validate_status(self.status, ["Draft", "Submitted", "Stopped",
"Cancelled"])
- self.validate_common()
+ validate_for_items(self)
self.validate_with_previous_doc()
self.validate_uom_is_integer("uom", "qty")
@@ -50,11 +51,6 @@
}
})
-
- def validate_common(self):
- pc = frappe.get_doc('Purchase Common')
- pc.validate_for_items(self)
-
def get_list_context(context=None):
from erpnext.controllers.website_list_for_contact import get_list_context
list_context = get_list_context(context)
diff --git a/erpnext/buying/utils.py b/erpnext/buying/utils.py
new file mode 100644
index 0000000..28c7579
--- /dev/null
+++ b/erpnext/buying/utils.py
@@ -0,0 +1,80 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import flt, cstr, cint
+from frappe import _
+
+from erpnext.stock.doctype.item.item import get_last_purchase_details
+from erpnext.stock.doctype.item.item import validate_end_of_life
+
+def update_last_purchase_rate(doc, is_submit):
+ """updates last_purchase_rate in item table for each item"""
+
+ import frappe.utils
+ this_purchase_date = frappe.utils.getdate(doc.get('posting_date') or doc.get('transaction_date'))
+
+ for d in doc.get("items"):
+ # get last purchase details
+ last_purchase_details = get_last_purchase_details(d.item_code, doc.name)
+
+ # compare last purchase date and this transaction's date
+ last_purchase_rate = None
+ if last_purchase_details and \
+ (last_purchase_details.purchase_date > this_purchase_date):
+ last_purchase_rate = last_purchase_details['base_rate']
+ elif is_submit == 1:
+ # even if this transaction is the latest one, it should be submitted
+ # for it to be considered for latest purchase rate
+ if flt(d.conversion_factor):
+ last_purchase_rate = flt(d.base_rate) / flt(d.conversion_factor)
+ else:
+ frappe.throw(_("UOM Conversion factor is required in row {0}").format(d.idx))
+
+ # update last purchsae rate
+ if last_purchase_rate:
+ frappe.db.sql("""update `tabItem` set last_purchase_rate = %s where name = %s""",
+ (flt(last_purchase_rate), d.item_code))
+
+def validate_for_items(doc):
+ items = []
+ for d in doc.get("items"):
+ if not d.qty:
+ if doc.doctype == "Purchase Receipt" and d.rejected_qty:
+ continue
+ frappe.throw(_("Please enter quantity for Item {0}").format(d.item_code))
+
+ # update with latest quantities
+ bin = frappe.db.sql("""select projected_qty from `tabBin` where
+ item_code = %s and warehouse = %s""", (d.item_code, d.warehouse), as_dict=1)
+
+ f_lst ={'projected_qty': bin and flt(bin[0]['projected_qty']) or 0, 'ordered_qty': 0, 'received_qty' : 0}
+ if d.doctype in ('Purchase Receipt Item', 'Purchase Invoice Item'):
+ f_lst.pop('received_qty')
+ for x in f_lst :
+ if d.meta.get_field(x):
+ d.set(x, f_lst[x])
+
+ item = frappe.db.sql("""select is_stock_item,
+ is_sub_contracted_item, end_of_life, disabled from `tabItem` where name=%s""",
+ d.item_code, as_dict=1)[0]
+
+ validate_end_of_life(d.item_code, item.end_of_life, item.disabled)
+
+ # validate stock item
+ if item.is_stock_item==1 and d.qty and not d.warehouse and not d.delivered_by_supplier:
+ frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx))
+
+ items.append(cstr(d.item_code))
+
+ if items and len(items) != len(set(items)) and \
+ not cint(frappe.db.get_single_value("Buying Settings", "allow_multiple_items") or 0):
+ frappe.throw(_("Same item cannot be entered multiple times."))
+
+def check_for_closed_status(doctype, docname):
+ status = frappe.db.get_value(doctype, docname, "status")
+
+ if status == "Closed":
+ frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
+
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 518f686..910c19c 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -2,10 +2,10 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
from frappe import _, throw
from frappe.utils import today, flt, cint, fmt_money, formatdate, getdate
-from erpnext.setup.utils import get_company_currency, get_exchange_rate
+from erpnext.setup.utils import get_exchange_rate
from erpnext.accounts.utils import get_fiscal_years, validate_fiscal_year, get_account_currency
from erpnext.utilities.transaction_base import TransactionBase
from erpnext.controllers.recurring_document import convert_to_recurring, validate_recurring_document
@@ -22,7 +22,7 @@
@property
def company_currency(self):
if not hasattr(self, "__company_currency"):
- self.__company_currency = get_company_currency(self.company)
+ self.__company_currency = erpnext.get_company_currency(self.company)
return self.__company_currency
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index a1c7185..5bc8bb3 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -6,9 +6,10 @@
from frappe import _, msgprint
from frappe.utils import flt,cint, cstr
-from erpnext.setup.utils import get_company_currency
from erpnext.accounts.party import get_party_details
from erpnext.stock.get_item_details import get_conversion_factor
+from erpnext.buying.utils import validate_for_items
+from erpnext.stock.stock_ledger import get_valuation_rate
from erpnext.controllers.stock_controller import StockController
@@ -40,9 +41,7 @@
# self.validate_purchase_return()
self.validate_rejected_warehouse()
self.validate_accepted_rejected_qty()
-
- pc_obj = frappe.get_doc('Purchase Common')
- pc_obj.validate_for_items(self)
+ validate_for_items(self)
#sub-contracting
self.validate_for_subcontracting()
@@ -88,9 +87,8 @@
def set_total_in_words(self):
from frappe.utils import money_in_words
- company_currency = get_company_currency(self.company)
if self.meta.get_field("base_in_words"):
- self.base_in_words = money_in_words(self.base_grand_total, company_currency)
+ self.base_in_words = money_in_words(self.base_grand_total, self.company_currency)
if self.meta.get_field("in_words"):
self.in_words = money_in_words(self.grand_total, self.currency)
@@ -225,9 +223,8 @@
"serial_no": rm.serial_no
})
if not rm.rate:
- from erpnext.stock.stock_ledger import get_valuation_rate
- rm.rate = get_valuation_rate(bom_item.item_code, self.supplier_warehouse,
- self.doctype, self.name)
+ rm.rate = get_valuation_rate(bom_item.item_code, self.supplier_warehouse,
+ self.doctype, self.name, currency=self.company_currency)
else:
rm.rate = bom_item.rate
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 4ea2a5f..d8f28af 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -106,24 +106,25 @@
def validate_quantity(doc, args, ref, valid_items, already_returned_items):
fields = ['qty']
- if doc.doctype in ['Purchase Invoice', 'Purchase Receipt']:
+ if doc.doctype in ['Purchase Receipt', 'Purchase Invoice']:
fields.extend(['received_qty', 'rejected_qty'])
already_returned_data = already_returned_items.get(args.item_code) or {}
for column in fields:
- return_qty = flt(already_returned_data.get(column, 0)) if len(already_returned_data) > 0 else 0
- referenced_qty = ref.get(column)
- max_return_qty = flt(referenced_qty) - return_qty
+ returned_qty = flt(already_returned_data.get(column, 0)) if len(already_returned_data) > 0 else 0
+ reference_qty = ref.get(column)
+ max_returnable_qty = flt(reference_qty) - returned_qty
label = column.replace('_', ' ').title()
-
- if flt(args.get(column)) > 0:
- frappe.throw(_("{0} must be negative in return document").format(label))
- elif return_qty >= referenced_qty and flt(args.get(column)) != 0:
- frappe.throw(_("Item {0} has already been returned").format(args.item_code), StockOverReturnError)
- elif abs(args.get(column)) > max_return_qty:
- frappe.throw(_("Row # {0}: Cannot return more than {1} for Item {2}")
- .format(args.idx, referenced_qty, args.item_code), StockOverReturnError)
+ if reference_qty:
+ if flt(args.get(column)) > 0:
+ frappe.throw(_("{0} must be negative in return document").format(label))
+ elif returned_qty >= reference_qty and args.get(column):
+ frappe.throw(_("Item {0} has already been returned")
+ .format(args.item_code), StockOverReturnError)
+ elif abs(args.get(column)) > max_returnable_qty:
+ frappe.throw(_("Row # {0}: Cannot return more than {1} for Item {2}")
+ .format(args.idx, reference_qty, args.item_code), StockOverReturnError)
def get_ref_item_dict(valid_items, ref_item_row):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 5f50ae3..af51f70 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -4,11 +4,9 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cint, flt, cstr, comma_or
-from erpnext.setup.utils import get_company_currency
from frappe import _, throw
from erpnext.stock.get_item_details import get_bin_details
from erpnext.stock.utils import get_incoming_rate
-from erpnext.stock.stock_ledger import get_valuation_rate
from erpnext.stock.get_item_details import get_conversion_factor
from erpnext.controllers.stock_controller import StockController
@@ -113,13 +111,11 @@
def set_total_in_words(self):
from frappe.utils import money_in_words
- company_currency = get_company_currency(self.company)
-
disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total"))
if self.meta.get_field("base_in_words"):
self.base_in_words = money_in_words(disable_rounded_total and
- abs(self.base_grand_total) or abs(self.base_rounded_total), company_currency)
+ abs(self.base_grand_total) or abs(self.base_rounded_total), self.company_currency)
if self.meta.get_field("in_words"):
self.in_words = money_in_words(disable_rounded_total and
abs(self.grand_total) or abs(self.rounded_total), self.currency)
@@ -170,7 +166,7 @@
if d.meta.get_field("stock_qty"):
if not d.conversion_factor:
frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx))
- d.stock_qty = flt(d.qty) * flt(d.conversion_factor)
+ d.stock_qty = flt(d.qty) * flt(d.conversion_factor)
def validate_selling_price(self):
def throw_message(item_name, rate, ref_rate_field):
@@ -207,7 +203,7 @@
if p.parent_detail_docname == d.name and p.parent_item == d.item_code:
# the packing details table's qty is already multiplied with parent's qty
il.append(frappe._dict({
- 'warehouse': p.warehouse,
+ 'warehouse': p.warehouse or d.warehouse,
'item_code': p.item_code,
'qty': flt(p.qty),
'uom': p.uom,
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 55bcaf3..d58ba4b 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -119,7 +119,7 @@
self.status = s[0]
break
elif s[1].startswith("eval:"):
- if eval(s[1][5:]):
+ if frappe.safe_eval(s[1][5:], None, { "self": self.as_dict(), "getdate": getdate, "nowdate": nowdate }):
self.status = s[0]
break
elif getattr(self, s[1])():
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index add882c..9f05345 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -54,9 +54,9 @@
self.check_expense_account(item_row)
- # If item is not a sample item
+ # If item is not a sample item
# and ( valuation rate not mentioned in an incoming entry
- # or incoming entry not found while delivering the item),
+ # or incoming entry not found while delivering the item),
# try to pick valuation rate from previous sle or Item master and update in SLE
# Otherwise, throw an exception
@@ -96,25 +96,25 @@
return process_gl_map(gl_list)
def update_stock_ledger_entries(self, sle):
- sle.valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse,
- self.doctype, self.name)
+ sle.valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse,
+ self.doctype, self.name, currency=self.company_currency)
sle.stock_value = flt(sle.qty_after_transaction) * flt(sle.valuation_rate)
sle.stock_value_difference = flt(sle.actual_qty) * flt(sle.valuation_rate)
-
+
if sle.name:
frappe.db.sql("""
- update
- `tabStock Ledger Entry`
- set
+ update
+ `tabStock Ledger Entry`
+ set
stock_value = %(stock_value)s,
- valuation_rate = %(valuation_rate)s,
- stock_value_difference = %(stock_value_difference)s
- where
+ valuation_rate = %(valuation_rate)s,
+ stock_value_difference = %(stock_value_difference)s
+ where
name = %(name)s""", (sle))
-
+
return sle
-
+
def get_voucher_details(self, default_expense_account, default_cost_center, sle_map):
if self.doctype == "Stock Reconciliation":
return [frappe._dict({ "name": voucher_detail_no, "expense_account": default_expense_account,
@@ -163,9 +163,9 @@
def get_stock_ledger_details(self):
stock_ledger = {}
stock_ledger_entries = frappe.db.sql("""
- select
+ select
name, warehouse, stock_value_difference, valuation_rate,
- voucher_detail_no, item_code, posting_date, posting_time,
+ voucher_detail_no, item_code, posting_date, posting_time,
actual_qty, qty_after_transaction
from
`tabStock Ledger Entry`
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 0e02df8..0355c26 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -3,10 +3,9 @@
from __future__ import unicode_literals
import json
-import frappe
+import frappe, erpnext
from frappe import _, scrub
from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
-from erpnext.setup.utils import get_company_currency
from erpnext.controllers.accounts_controller import validate_conversion_rate, \
validate_taxes_and_charges, validate_inclusive_tax
@@ -38,7 +37,7 @@
def validate_conversion_rate(self):
# validate conversion rate
- company_currency = get_company_currency(self.doc.company)
+ company_currency = erpnext.get_company_currency(self.doc.company)
if not self.doc.currency or self.doc.currency == company_currency:
self.doc.currency = company_currency
self.doc.conversion_rate = 1.0
@@ -327,7 +326,7 @@
self.doc.rounded_total = round_based_on_smallest_currency_fraction(self.doc.grand_total,
self.doc.currency, self.doc.precision("rounded_total"))
if self.doc.meta.get_field("base_rounded_total"):
- company_currency = get_company_currency(self.doc.company)
+ company_currency = erpnext.get_company_currency(self.doc.company)
self.doc.base_rounded_total = \
round_based_on_smallest_currency_fraction(self.doc.base_grand_total,
@@ -405,11 +404,14 @@
self.doc.total_advance = flt(total_allocated_amount, self.doc.precision("total_advance"))
if self.doc.party_account_currency == self.doc.currency:
- invoice_total = self.doc.grand_total
- else:
- invoice_total = flt(self.doc.grand_total * self.doc.conversion_rate,
+ invoice_total = flt(self.doc.grand_total - flt(self.doc.write_off_amount),
self.doc.precision("grand_total"))
-
+ else:
+ base_write_off_amount = flt(flt(self.doc.write_off_amount) * self.doc.conversion_rate,
+ self.doc.precision("base_write_off_amount"))
+ invoice_total = flt(self.doc.grand_total * self.doc.conversion_rate,
+ self.doc.precision("grand_total")) - base_write_off_amount
+
if invoice_total > 0 and self.doc.total_advance > invoice_total:
frappe.throw(_("Advance amount cannot be greater than {0} {1}")
.format(self.doc.party_account_currency, invoice_total))
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 6ca20c3..b078036 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -18,7 +18,7 @@
"get_list": get_transaction_list
}
-def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20):
+def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by="modified"):
from frappe.www.list import get_list
user = frappe.session.user
key = None
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 90be781..3f7a814 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -574,7 +574,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 1,
+ "in_list_view": 0,
"in_standard_filter": 0,
"label": "Territory",
"length": 0,
@@ -1152,7 +1152,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-03-12 21:55:21.598112",
+ "modified": "2017-04-04 01:21:02.165730",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 913d2e4..3c553a5 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -194,11 +194,12 @@
quotation.transaction_date)
quotation.conversion_rate = exchange_rate
-
+
# get default taxes
taxes = get_default_taxes_and_charges("Sales Taxes and Charges Template")
- quotation.extend("taxes", taxes)
-
+ if taxes:
+ quotation.extend("taxes", taxes)
+
quotation.run_method("set_missing_values")
quotation.run_method("calculate_taxes_and_totals")
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 400b076..3675f0f 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -63,6 +63,13 @@
"language": "english"
})
+ company = erpnext.get_default_company()
+
+ if company:
+ company_doc = frappe.get_doc("Company", company)
+ company_doc.db_set('default_payroll_payable_account',
+ frappe.db.get_value('Account', dict(account_name='Payroll Payable')))
+
def setup_demo_page():
# home page should always be "start"
website_settings = frappe.get_doc("Website Settings", "Website Settings")
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 2536602..0b644c4 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -34,14 +34,16 @@
process_payroll.salary_slip_based_on_timesheet = 0
process_payroll.create_salary_slips()
process_payroll.submit_salary_slips()
- process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
- reference_number=random_string(10))
+ process_payroll.make_accural_jv_entry()
+ # process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
+ # reference_number=random_string(10))
process_payroll.salary_slip_based_on_timesheet = 1
process_payroll.create_salary_slips()
process_payroll.submit_salary_slips()
- process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
- reference_number=random_string(10))
+ process_payroll.make_accural_jv_entry()
+ # process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
+ # reference_number=random_string(10))
if frappe.db.get_global('demo_hr_user'):
make_timesheet_records()
diff --git a/erpnext/docs/assets/img/accounts/pos-customer.png b/erpnext/docs/assets/img/accounts/pos-customer.png
index c3cbb8a..20bce38 100644
--- a/erpnext/docs/assets/img/accounts/pos-customer.png
+++ b/erpnext/docs/assets/img/accounts/pos-customer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pos-email.png b/erpnext/docs/assets/img/accounts/pos-email.png
new file mode 100644
index 0000000..31aa086
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pos-email.png
Binary files differ
diff --git a/erpnext/docs/assets/img/taxes-and-charges.gif b/erpnext/docs/assets/img/selling/taxes-and-charges.gif
similarity index 100%
rename from erpnext/docs/assets/img/taxes-and-charges.gif
rename to erpnext/docs/assets/img/selling/taxes-and-charges.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png b/erpnext/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png
new file mode 100644
index 0000000..aec9293
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png b/erpnext/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png
new file mode 100644
index 0000000..69b31d6
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/roles-for-page.png b/erpnext/docs/assets/img/users-and-permissions/roles-for-page.png
new file mode 100644
index 0000000..f28c6d7
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/roles-for-page.png
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/roles-for-report.png b/erpnext/docs/assets/img/users-and-permissions/roles-for-report.png
new file mode 100644
index 0000000..1f8fd4e
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/roles-for-report.png
Binary files differ
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index 1d50b78..4740c5c 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -640,8 +640,8 @@
the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.</p>
-<pre><code> <one line="" to="" give="" the="" program's="" name="" and="" a="" brief="" idea="" of="" what="" it="" does.="">
- Copyright (C) <year> <name of="" author="">
+<pre><code> <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 64fa22c..0c7e591 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -27,7 +27,7 @@
### Customer
-You can select one of the existing Customer from the Customer master. If Customer doesn't exist in the Customer master, enter Customer Name in the POS Invoice view itself. On creation of POS Invoice, Customer will be auto-created in the Customer master.
+In POS, user can select the existing customer during making an order or create the new customer. This features works in the offline mode also. User can also add the customer details like contact number, address details etc on the form. The customer which has been created from the POS will be synced when the internet connection is active.
<img class="screenshot" alt="POS Customer" src="{{docs_base_url}}/assets/img/accounts/pos-customer.png">
@@ -105,4 +105,9 @@
To see entries after “Submit”, click on “View Ledger”.
+### Email
+User can send email from the POS, after submission of an order, user has to click on menu > email
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/pos-email.png">
+After sync of an order, email sent to the customer with the print of the bill in the attachment
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
index b00f32a..74243df 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
@@ -1,4 +1,5 @@
adding-users
role-based-permissions
user-permissions
+role-permisison-for-page-and-report
sharing
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
new file mode 100644
index 0000000..3a26a32
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
@@ -0,0 +1,25 @@
+# Role Permission for Page and Report
+
+In ERPNext, user can make his custom user interface using Page and the custom report using Report Builder or Query Report. ERPNext has role-based-permission system where user can assign roles to the user. And the same role can be assigned to the page and report, to access them.
+
+If user has enabled the developer mode, then they can add the roles directly in the page and report record. But in that case, the permissions will also be reflected in the json file for the page / report.
+
+### For Page
+<img alt="Assign roles to the page" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/roles-for-page.png">
+
+### For Report
+<img alt="Assign roles to the report" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/roles-for-report.png">
+
+## Tool for custom roles assignment
+
+If developer mode is disabled, then user can assign the roles to the page and report, using "Role Permission for Page and Report" page.
+
+To access, goto Setup > Permissions > Role Permission for Page and Report
+
+<img alt="Tools to assign custom roles to the page" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/role-permission-for-page-and-report.png">
+
+### Reset to defaults
+
+Using "Reset to Default" button, user can remove the custom permissions applied on a page or report. Then default permissions will be applicable on that page or report.
+
+<img alt="Reset the default roles" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png">
diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
index 72b03b7..e78a112 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/assignment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
@@ -22,7 +22,7 @@
####ToDo List of Assignee
-This transaction will appear in the To-do list of the ser in “Todo” section.
+This transaction will appear in the To-do list of the user in “Todo” section.
<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-3.png">
@@ -32,6 +32,6 @@
<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-4.png">
-Once assignment is set as completed, Status of its ToDo record will be set as Closed.
+Once assignment is set as completed, the Status of its ToDo record will be set as Closed.
{next}
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index f4b87d2..5b4e687 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -148,8 +148,8 @@
"User": {
"after_insert": "frappe.email.doctype.contact.contact.update_contact",
"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",
- "on_update": "erpnext.hr.doctype.employee.employee.update_user_permissions",
- "on_update": "frappe.geo.address_and_contact.set_default_role"
+ "on_update": ["erpnext.hr.doctype.employee.employee.update_user_permissions",
+ "erpnext.portal.utils.set_default_role"]
},
("Sales Taxes and Charges Template", 'Price List'): {
"on_update": "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings"
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 35a2807..c53e497 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -417,7 +417,7 @@
"no_copy": 0,
"oldfieldname": "gender",
"oldfieldtype": "Select",
- "options": "\nMale\nFemale",
+ "options": "\nMale\nFemale\nOther",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2431,4 +2431,4 @@
"title_field": "employee_name",
"track_changes": 1,
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
index de8e17c..c0c0ef0 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
@@ -4,6 +4,7 @@
},
onload: function(frm) {
+ frm.doc.department = frm.doc.branch = frm.doc.company = "All";
frm.set_value("date", get_today());
erpnext.employee_attendance_tool.load_employees(frm);
},
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
index 7438737..6ddb722 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
@@ -13,11 +13,18 @@
@frappe.whitelist()
-def get_employees(date, department=None, branch=None, company=None):
+def get_employees(date, department = None, branch = None, company = None):
attendance_not_marked = []
attendance_marked = []
- employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters={
- "status": "Active", "department": department, "branch": branch, "company": company}, order_by="employee_name")
+ filters = {"status": "Active"}
+ if department != "All":
+ filters["department"] = department
+ if branch != "All":
+ filters["branch"] = branch
+ if company != "All":
+ filters["company"] = company
+
+ employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters=filters, order_by="employee_name")
marked_employee = {}
for emp in frappe.get_list("Attendance", fields=["employee", "status"],
filters={"attendance_date": date}):
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 5b41154..6f74388 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -934,7 +934,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-03-08 06:28:46.142302",
+ "modified": "2017-04-10 12:15:20.363859",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim",
diff --git a/erpnext/hr/doctype/salary_component/salary_component.py b/erpnext/hr/doctype/salary_component/salary_component.py
index c02d952..35d274c 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.py
+++ b/erpnext/hr/doctype/salary_component/salary_component.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
-from frappe import _
+from frappe.model.naming import append_number_if_name_exists
class SalaryComponent(Document):
def validate(self):
@@ -13,12 +13,10 @@
def validate_abbr(self):
if not self.salary_component_abbr:
- self.salary_component_abbr = ''.join([c[0] for c in self.salary_component.split()]).upper()
+ self.salary_component_abbr = ''.join([c[0] for c in
+ self.salary_component.split()]).upper()
self.salary_component_abbr = self.salary_component_abbr.strip()
- if self.get('__islocal') and len(self.salary_component_abbr) > 5:
- frappe.throw(_("Abbreviation cannot have more than 5 characters"))
-
- if frappe.db.sql("select salary_component_abbr from `tabSalary Component` where name!=%s and salary_component_abbr=%s", (self.name, self.salary_component_abbr)):
- frappe.throw(_("Abbreviation {0} already used for another salary component").format(self.salary_component_abbr))
\ No newline at end of file
+ self.salary_component_abbr = append_number_if_name_exists('Salary Component',
+ self.salary_component_abbr, 'salary_component_abbr', separator='_')
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 34b729f..afd45b5 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -2,13 +2,12 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
from frappe.utils import add_days, cint, cstr, flt, getdate, rounded, date_diff, money_in_words
from frappe.model.naming import make_autoname
from frappe import msgprint, _
-from erpnext.setup.utils import get_company_currency
from erpnext.hr.doctype.process_payroll.process_payroll import get_start_end_dates
from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
from erpnext.utilities.transaction_base import TransactionBase
@@ -33,7 +32,7 @@
# if self.salary_slip_based_on_timesheet or not self.net_pay:
self.calculate_net_pay()
- company_currency = get_company_currency(self.company)
+ company_currency = erpnext.get_company_currency(self.company)
self.total_in_words = money_in_words(self.rounded_total, company_currency)
if frappe.db.get_single_value("HR Settings", "max_working_hours_against_timesheet"):
@@ -77,12 +76,12 @@
def eval_condition_and_formula(self, d, data):
try:
if d.condition:
- if not eval(d.condition, None, data):
+ if not frappe.safe_eval(d.condition, None, data):
return None
amount = d.amount
if d.amount_based_on_formula:
if d.formula:
- amount = eval(d.formula, None, data)
+ amount = frappe.safe_eval(d.formula, None, data)
if amount:
data[d.abbr] = amount
@@ -348,7 +347,7 @@
self.sum_components('earnings', 'gross_pay')
self.sum_components('deductions', 'total_deduction')
-
+
self.set_loan_repayment()
self.net_pay = flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))
@@ -356,11 +355,11 @@
self.precision("net_pay") if disable_rounded_total else 0)
def set_loan_repayment(self):
- employee_loan = frappe.db.sql("""select sum(principal_amount) as principal_amount, sum(interest_amount) as interest_amount,
+ employee_loan = frappe.db.sql("""select sum(principal_amount) as principal_amount, sum(interest_amount) as interest_amount,
sum(total_payment) as total_loan_repayment from `tabRepayment Schedule`
where payment_date between %s and %s and parent in (select name from `tabEmployee Loan`
where employee = %s and repay_from_salary = 1 and docstatus = 1)""",
- (self.start_date, self.end_date, self.employee), as_dict=True)
+ (self.start_date, self.end_date, self.employee), as_dict=True)
if employee_loan:
self.principal_amount = employee_loan[0].principal_amount
self.interest_amount = employee_loan[0].interest_amount
diff --git a/erpnext/hr/report/vehicle_expenses/vehicle_expenses.js b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.js
index 8a05c81..486d259 100644
--- a/erpnext/hr/report/vehicle_expenses/vehicle_expenses.js
+++ b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.js
@@ -22,18 +22,6 @@
query_report.trigger_refresh();
});
}
- },
- {
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.defaults.get_user_default("year_start_date"),
- },
- {
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.defaults.get_user_default("year_end_date"),
}
]
}
diff --git a/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
index a03b7f3..63e5f3c 100644
--- a/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
+++ b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
@@ -3,41 +3,41 @@
from __future__ import unicode_literals
import frappe
+import erpnext
from frappe import _
from frappe.utils import flt,cstr
from erpnext.accounts.report.financial_statements import get_period_list
def execute(filters=None):
- period_list = get_period_list(2016, 2016,"Monthly")
- for period in period_list:
- pass
columns, data = [], []
- columns=get_columns()
- data=get_log_data(filters)
- chart=get_chart_data(data,period_list)
+ if filters.get('fiscal_year'):
+ company = erpnext.get_default_company()
+ period_list = get_period_list(filters.get('fiscal_year'), filters.get('fiscal_year'),"Monthly", company)
+ columns=get_columns()
+ data=get_log_data(filters)
+ chart=get_chart_data(data,period_list)
return columns, data, None, chart
-
+
def get_columns():
columns = [_("License") + ":Link/Vehicle:100", _("Make") + ":data:50",
- _("Model") + ":data:50", _("Location") + ":data:100",
- _("Log") + ":Link/Vehicle Log:100", _("Odometer") + ":Int:80",
- _("Date") + ":Date:100", _("Fuel Qty") + ":Float:80",
- _("Fuel Price") + ":Float:100",_("Service Expense") + ":Float:100"
+ _("Model") + ":data:50", _("Location") + ":data:100",
+ _("Log") + ":Link/Vehicle Log:100", _("Odometer") + ":Int:80",
+ _("Date") + ":Date:100", _("Fuel Qty") + ":Float:80",
+ _("Fuel Price") + ":Float:100",_("Service Expense") + ":Float:100"
]
return columns
def get_log_data(filters):
- conditions=""
- if filters.from_date:
- conditions += " and date >= %(from_date)s"
- if filters.to_date:
- conditions += " and date <= %(to_date)s"
- data = frappe.db.sql("""select vhcl.license_plate as "License",vhcl.make as "Make",vhcl.model as "Model",
- vhcl.location as "Location",log.name as "Log",log.odometer as "Odometer",log.date as "Date",
- log.fuel_qty as "Fuel Qty",log.price as "Fuel Price"
- from `tabVehicle` vhcl,`tabVehicle Log` log
- where vhcl.license_plate = log.license_plate and log.docstatus = 1 %s
- order by date""" % (conditions,),filters, as_dict=1)
+ fy = frappe.db.get_value('Fiscal Year', filters.get('fiscal_year'), ['year_start_date', 'year_end_date'], as_dict=True)
+ data = frappe.db.sql("""select
+ vhcl.license_plate as "License", vhcl.make as "Make", vhcl.model as "Model",
+ vhcl.location as "Location", log.name as "Log", log.odometer as "Odometer",
+ log.date as "Date", log.fuel_qty as "Fuel Qty", log.price as "Fuel Price"
+ from
+ `tabVehicle` vhcl,`tabVehicle Log` log
+ where
+ vhcl.license_plate = log.license_plate and log.docstatus = 1 and date between %s and %s
+ order by date""" ,(fy.year_start_date, fy.year_end_date), as_dict=1)
dl=list(data)
for row in dl:
row["Service Expense"]= get_service_expense(row["Log"])
@@ -45,8 +45,8 @@
def get_service_expense(logname):
expense_amount = frappe.db.sql("""select sum(expense_amount)
- from `tabVehicle Log` log,`tabVehicle Service` ser
- where ser.parent=log.name and log.name=%s""",logname)
+ from `tabVehicle Log` log,`tabVehicle Service` ser
+ where ser.parent=log.name and log.name=%s""",logname)
return flt(expense_amount[0][0]) if expense_amount else 0
def get_chart_data(data,period_list):
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 9fa2a81..c42403c 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 0,
"beta": 0,
@@ -1574,18 +1575,18 @@
"unique": 0
}
],
+ "has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
- "in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-02-21 13:10:27.394012",
+ "modified": "2017-04-10 12:13:59.630780",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM",
@@ -1659,6 +1660,6 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index abb2817..b8a8ae8 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -281,12 +281,15 @@
return bom_list
- def traverse_tree(self, bom_list=[]):
+ def traverse_tree(self, bom_list=None):
def _get_children(bom_no):
return [cstr(d[0]) for d in frappe.db.sql("""select bom_no from `tabBOM Item`
where parent = %s and ifnull(bom_no, '') != ''""", bom_no)]
count = 0
+ if not bom_list:
+ bom_list = []
+
if self.name not in bom_list:
bom_list.append(self.name)
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 1217790..6037397 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -218,7 +218,7 @@
project: doc.project
},
callback: function(r) {
- $.each(["description", "stock_uom", "bom_no"], function(i, field) {
+ $.each(["description", "stock_uom", "project", "bom_no"], function(i, field) {
cur_frm.set_value(field, r.message[field]);
});
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index 79ef969..882833f 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -1316,7 +1316,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-03-28 19:19:08.559879",
+ "modified": "2017-04-10 12:13:09.312186",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Order",
@@ -1369,6 +1369,6 @@
"show_name_in_global_search": 0,
"sort_order": "ASC",
"title_field": "production_item",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 2d9a067..b9b10c1 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -498,6 +498,7 @@
frappe.throw(_("Default BOM for {0} not found for Project {1}").format(item, project))
frappe.throw(_("Default BOM for {0} not found").format(item))
+ res['project'] = frappe.db.get_value('BOM', res['bom_no'], 'project')
res.update(check_if_scrap_warehouse_mandatory(res["bom_no"]))
return res
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index cb8ba03..5bf0f3f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -381,4 +381,6 @@
erpnext.patches.v7_2.make_all_assessment_group
erpnext.patches.v8_0.manufacturer_childtable_migrate
erpnext.patches.v8_0.repost_reserved_qty_for_multiple_sales_uom
-erpnext.patches.v8_0.addresses_linked_to_lead
\ No newline at end of file
+erpnext.patches.v8_0.addresses_linked_to_lead
+execute:frappe.delete_doc('DocType', 'Purchase Common')
+erpnext.patches.v8_0.update_stock_qty_value_in_purchase_invoice
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_stock_qty_value_in_purchase_invoice.py b/erpnext/patches/v8_0/update_stock_qty_value_in_purchase_invoice.py
new file mode 100644
index 0000000..be5cf3a
--- /dev/null
+++ b/erpnext/patches/v8_0/update_stock_qty_value_in_purchase_invoice.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc('accounts', 'doctype', 'purchase_invoice_item')
+ frappe.db.sql("update `tabPurchase Invoice Item` set stock_qty = qty, stock_uom = uom")
\ No newline at end of file
diff --git a/erpnext/portal/utils.py b/erpnext/portal/utils.py
new file mode 100644
index 0000000..7dffd03
--- /dev/null
+++ b/erpnext/portal/utils.py
@@ -0,0 +1,17 @@
+import frappe
+
+def set_default_role(doc, method):
+ '''Set customer, supplier, student based on email'''
+ if frappe.flags.setting_role or frappe.flags.in_migrate:
+ return
+ contact_name = frappe.get_value('Contact', dict(email_id=doc.email))
+ if contact_name:
+ contact = frappe.get_doc('Contact', contact_name)
+ for link in contact.links:
+ frappe.flags.setting_role = True
+ if link.link_doctype=='Customer':
+ doc.add_roles('Customer')
+ elif link.link_doctype=='Supplier':
+ doc.add_roles('Supplier')
+ elif frappe.get_value('Student', dict(student_email_id=doc.email)):
+ doc.add_roles('Student')
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 289b7dd..37734f1 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -214,7 +214,7 @@
and docstatus < 2
group by date(from_time)''', name))
-def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20):
+def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
return frappe.db.sql('''select distinct project.*
from tabProject project, `tabProject User` project_user
where
diff --git a/erpnext/projects/doctype/project/project_list.js b/erpnext/projects/doctype/project/project_list.js
index 437bf60..0f715bf 100644
--- a/erpnext/projects/doctype/project/project_list.js
+++ b/erpnext/projects/doctype/project/project_list.js
@@ -1,5 +1,5 @@
frappe.listview_settings['Project'] = {
- add_fields: ["status", "priority", "is_active", "percent_complete", "expected_end_date"],
+ add_fields: ["status", "priority", "is_active", "percent_complete", "expected_end_date", "project_name"],
filters:[["status","=", "Open"]],
get_indicator: function(doc) {
if(doc.status=="Open" && doc.percent_complete) {
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/public/js/controllers/buying.js
similarity index 97%
rename from erpnext/buying/doctype/purchase_common/purchase_common.js
rename to erpnext/public/js/controllers/buying.js
index 6867dd0..108aac1 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -113,7 +113,7 @@
frappe.model.round_floats_in(item, ["qty", "received_qty"]);
if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["qty", "received_qty"])){ return }
-
+
if(!item.rejected_qty && item.qty) {
item.received_qty = item.qty;
}
@@ -138,14 +138,14 @@
frappe.model.round_floats_in(item, ["received_qty", "rejected_qty"]);
if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["received_qty", "rejected_qty"])){ return }
-
+
item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
this.qty(doc, cdt, cdn);
},
validate_negative_quantity: function(cdt, cdn, item, fieldnames){
if(!item || !fieldnames) { return }
-
+
var is_negative_qty = false;
for(var i = 0; i<fieldnames.length; i++) {
if(item[fieldnames[i]] < 0){
@@ -219,12 +219,12 @@
my_items.push(cur_frm.doc.items[i].item_code);
}
}
- frappe.call({
+ frappe.call({
method: "erpnext.buying.doctype.purchase_common.purchase_common.get_linked_material_requests",
args:{
- items: my_items
- },
- callback: function(r) {
+ items: my_items
+ },
+ callback: function(r) {
var i = 0;
var item_length = cur_frm.doc.items.length;
while (i < item_length) {
@@ -239,32 +239,32 @@
d.qty = d.qty - my_qty;
cur_frm.doc.items[i].stock_qty = my_qty*cur_frm.doc.items[i].conversion_factor;
cur_frm.doc.items[i].qty = my_qty;
-
+
frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")");
if (qty > 0)
{
frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items");
item_length++;
-
+
for (key in cur_frm.doc.items[i])
{
newrow[key] = cur_frm.doc.items[i][key];
}
-
+
newrow.idx = item_length;
newrow["stock_qty"] = newrow.conversion_factor*qty;
newrow["qty"] = qty;
-
+
newrow["material_request"] = "";
newrow["material_request_item"] = "";
-
+
}
-
-
-
+
+
+
}
-
+
});
i++;
}
diff --git a/erpnext/schools/doctype/fees/fees.py b/erpnext/schools/doctype/fees/fees.py
index d2540f7..7e660af 100644
--- a/erpnext/schools/doctype/fees/fees.py
+++ b/erpnext/schools/doctype/fees/fees.py
@@ -18,7 +18,7 @@
self.total_amount += d.amount
self.outstanding_amount = self.total_amount
-def get_fee_list(doctype, txt, filters, limit_start, limit_page_length=20):
+def get_fee_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
user = frappe.session.user
student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
if student:
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index c685fcb..1654c3b 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -497,7 +497,7 @@
"label": "Gender",
"length": 0,
"no_copy": 0,
- "options": "\nMale\nFemale",
+ "options": "\nMale\nFemale\nOther",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -1135,4 +1135,4 @@
"title_field": "title",
"track_changes": 0,
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
index fd37a15..3b0022f 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
@@ -127,6 +127,8 @@
function() { //ifyes
frappe.call({
method: "erpnext.schools.api.mark_attendance",
+ freeze: true,
+ freeze_message: "Marking attendance",
args: {
"students_present": students_present,
"students_absent": students_absent,
diff --git a/erpnext/schools/doctype/student_batch/student_batch.js b/erpnext/schools/doctype/student_batch/student_batch.js
index 7fad5d7..00b261e 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.js
+++ b/erpnext/schools/doctype/student_batch/student_batch.js
@@ -14,9 +14,6 @@
});
});
frm.add_custom_button(__("Newsletter"), function() {
- frappe.route_options = {
- email_group: frm.doc.name
- }
frappe.set_route("List", "Newsletter");
});
}
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index 1dcbc3a..595fa08 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -26,9 +26,6 @@
});
});
frm.add_custom_button(__("Newsletter"), function() {
- frappe.route_options = {
- email_group: frm.doc.name
- }
frappe.set_route("List", "Newsletter");
});
}
diff --git a/erpnext/selling/doctype/customer/customer_list.js b/erpnext/selling/doctype/customer/customer_list.js
index 09c3e93..38fc9ad 100644
--- a/erpnext/selling/doctype/customer/customer_list.js
+++ b/erpnext/selling/doctype/customer/customer_list.js
@@ -1,3 +1,3 @@
frappe.listview_settings['Customer'] = {
- add_fields: ["customer_name", "territory", "customer_group", "customer_type"],
+ add_fields: ["customer_name", "territory", "customer_group", "customer_type", "image"],
};
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index b118e55..950150f 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -371,7 +371,7 @@
"oldfieldname": "delivery_date",
"oldfieldtype": "Date",
"permlevel": 0,
- "print_hide": 1,
+ "print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
@@ -3516,7 +3516,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-03-29 04:38:25.247179",
+ "modified": "2017-04-10 12:13:03.136885",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -3652,6 +3652,6 @@
"sort_order": "DESC",
"timeline_field": "customer",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index dd7bca9..c09255d 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -79,7 +79,7 @@
if not frappe.local.flags.ignore_chart_of_accounts:
self.set_default_accounts()
if self.default_cash_account:
- self.mode_of_payment()
+ self.set_mode_of_payment_account()
if self.default_currency:
frappe.db.set_value("Currency", self.default_currency, "enabled", 1)
@@ -123,7 +123,7 @@
{"company": self.name, "account_type": "Receivable", "is_group": 0}))
frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
{"company": self.name, "account_type": "Payable", "is_group": 0}))
-
+
def validate_coa_input(self):
if self.create_chart_of_accounts_based_on == "Existing Company":
self.chart_of_accounts = None
@@ -166,7 +166,7 @@
if account:
self.db_set(fieldname, account)
- def mode_of_payment(self):
+ def set_mode_of_payment_account(self):
cash = frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name')
if cash and not frappe.db.get_value('Mode of Payment Account', {'company': self.name}):
mode_of_payment = frappe.get_doc('Mode of Payment', cash)
@@ -294,7 +294,3 @@
parts.append(company_abbr)
return " - ".join(parts)
-
-def get_company_currency(company):
- return frappe.local_cache("company_currency", company,
- lambda: frappe.db.get_value("Company", company, "default_currency"))
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 26509ed..922479c 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -177,6 +177,7 @@
selling_settings.cust_master_name = "Customer Name"
selling_settings.so_required = "No"
selling_settings.dn_required = "No"
+ selling_settings.allow_multiple_items = 1
selling_settings.save()
buying_settings = frappe.get_doc("Buying Settings")
@@ -184,6 +185,7 @@
buying_settings.po_required = "No"
buying_settings.pr_required = "No"
buying_settings.maintain_same_rate = 1
+ buying_settings.allow_multiple_items = 1
buying_settings.save()
notification_control = frappe.get_doc("Notification Control")
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index cb63837..55a0fd3 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -3,19 +3,10 @@
from __future__ import unicode_literals
import frappe
-from frappe import _, throw
+from frappe import _
from frappe.utils import flt
from frappe.utils import get_datetime_str, nowdate
-def get_company_currency(company):
- currency = frappe.db.get_value("Company", company, "default_currency", cache=True)
- if not currency:
- currency = frappe.db.get_default("currency")
- if not currency:
- throw(_('Please specify Default Currency in Company Master and Global Defaults'))
-
- return currency
-
def get_root_of(doctype):
"""Get root element of a DocType with a tree structure"""
result = frappe.db.sql_list("""select name from `tab%s`
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index ffdc66d..e4bbd87 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py
@@ -241,7 +241,7 @@
}
},
"Purchase Invoice Item": {
- "columns": ["name", "parent", "item_code", "(qty * conversion_factor) as qty", "base_net_amount"],
+ "columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 5d4537e..5236031 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -39,7 +39,7 @@
});
if (sys_defaults.auto_accounting_for_stock) {
- frm.set_query('expense_account', 'items', function(frm) {
+ frm.set_query('expense_account', 'items', function(doc, cdt, cdn) {
return {
filters: {
"report_type": "Profit and Loss",
@@ -49,7 +49,7 @@
}
});
- frm.set_query('cost_center', 'items', function(frm) {
+ frm.set_query('cost_center', 'items', function(doc, cdt, cdn) {
return {
filters: {
'company': doc.company,
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index dc6de95..9d3bbf4 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -292,36 +292,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "eval:doc.docstatus==0",
- "fieldname": "set_posting_time",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Edit Posting Date and Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"default": "Today",
"depends_on": "",
"fieldname": "posting_date",
@@ -390,6 +360,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "set_posting_time",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Edit Posting Date and Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "po_no",
"fieldtype": "Data",
"hidden": 0,
@@ -3288,7 +3288,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-03-29 04:55:45.044810",
+ "modified": "2017-04-10 12:03:29.645642",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
@@ -3404,6 +3404,6 @@
"sort_order": "DESC",
"timeline_field": "customer",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index 40319e5..cc46177 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -11,7 +11,7 @@
} else if (doc.end_of_life && doc.end_of_life < frappe.datetime.get_today()) {
return [__("Expired"), "grey", "end_of_life,<,Today"];
} else if (doc.has_variants) {
- return [__("Template"), "blue", "has_variants,=,Yes"];
+ return [__("Template"), "orange", "has_variants,=,Yes"];
} else if (doc.variant_of) {
return [__("Variant"), "green", "variant_of,=," + doc.variant_of];
}
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 3a5a351..be0b4c2 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -1,7 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/public/js/controllers/buying.js' %};
frappe.ui.form.on('Material Request', {
setup: function(frm) {
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index ca25414..82c4c19 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -13,7 +13,7 @@
from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
from erpnext.controllers.buying_controller import BuyingController
from erpnext.manufacturing.doctype.production_order.production_order import get_item_details
-
+from erpnext.buying.utils import check_for_closed_status, validate_for_items
form_grid_templates = {
"items": "templates/form_grid/material_request_grid.html"
@@ -72,12 +72,9 @@
from erpnext.controllers.status_updater import validate_status
validate_status(self.status, ["Draft", "Submitted", "Stopped", "Cancelled"])
- pc_obj = frappe.get_doc('Purchase Common')
- pc_obj.validate_for_items(self)
+ validate_for_items(self)
# self.set_title()
-
-
# self.validate_qty_against_so()
# NOTE: Since Item BOM and FG quantities are combined, using current data, it cannot be validated
# Though the creation of Material Request from a Production Plan can be rethought to fix this
@@ -112,9 +109,7 @@
self.update_requested_qty()
def on_cancel(self):
- pc_obj = frappe.get_doc('Purchase Common')
-
- pc_obj.check_for_closed_status(self.doctype, self.name)
+ check_for_closed_status(self.doctype, self.name)
self.update_requested_qty()
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index f9370b4..383de01 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -1,7 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/public/js/controllers/buying.js' %};
frappe.provide("erpnext.stock");
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 73367e3..3877028 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -230,36 +230,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "eval:doc.docstatus==0",
- "fieldname": "set_posting_time",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Edit Posting Date and Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"default": "Today",
"depends_on": "",
"fieldname": "posting_date",
@@ -328,6 +298,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "set_posting_time",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Edit Posting Date and Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"description": "",
"fieldname": "company",
"fieldtype": "Link",
@@ -2846,7 +2846,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-03-14 16:10:58.769483",
+ "modified": "2017-04-10 12:02:07.434102",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
@@ -2962,6 +2962,6 @@
"sort_order": "DESC",
"timeline_field": "supplier",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index b89987c..1f8fd8d 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -12,6 +12,7 @@
from erpnext.controllers.buying_controller import BuyingController
from erpnext.accounts.utils import get_account_currency
from frappe.desk.notifications import clear_doctype_notifications
+from erpnext.buying.utils import check_for_closed_status, update_last_purchase_rate
form_grid_templates = {
"items": "templates/form_grid/item_grid.html"
@@ -56,8 +57,7 @@
self.validate_uom_is_integer("uom", ["qty", "received_qty"])
self.validate_uom_is_integer("stock_uom", "stock_qty")
- pc_obj = frappe.get_doc('Purchase Common')
- self.check_for_closed_status(pc_obj)
+ self.check_for_closed_status()
if getdate(self.posting_date) > getdate(nowdate()):
throw(_("Posting Date cannot be future date"))
@@ -98,17 +98,16 @@
return po_qty, po_warehouse
# Check for Closed status
- def check_for_closed_status(self, pc_obj):
+ def check_for_closed_status(self):
check_list =[]
for d in self.get('items'):
- if d.meta.get_field('purchase_order') and d.purchase_order and d.purchase_order not in check_list:
+ if (d.meta.get_field('purchase_order') and d.purchase_order
+ and d.purchase_order not in check_list):
check_list.append(d.purchase_order)
- pc_obj.check_for_closed_status('Purchase Order', d.purchase_order)
+ check_for_closed_status('Purchase Order', d.purchase_order)
# on submit
def on_submit(self):
- purchase_controller = frappe.get_doc("Purchase Common")
-
# Check for Approving Authority
frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype,
self.company, self.base_grand_total)
@@ -120,7 +119,7 @@
self.update_billing_status()
if not self.is_return:
- purchase_controller.update_last_purchase_rate(self, 1)
+ update_last_purchase_rate(self, 1)
# Updating stock ledger should always be called after updating prevdoc status,
# because updating ordered qty in bin depends upon updated ordered qty in PO
@@ -140,9 +139,7 @@
frappe.throw(_("Purchase Invoice {0} is already submitted").format(self.submit_rv[0][0]))
def on_cancel(self):
- pc_obj = frappe.get_doc('Purchase Common')
-
- self.check_for_closed_status(pc_obj)
+ self.check_for_closed_status()
# Check if Purchase Invoice has been submitted against current Purchase Order
submitted = frappe.db.sql("""select t1.name
from `tabPurchase Invoice` t1,`tabPurchase Invoice Item` t2
@@ -157,7 +154,7 @@
self.update_billing_status()
if not self.is_return:
- pc_obj.update_last_purchase_rate(self, 0)
+ update_last_purchase_rate(self, 0)
# Updating stock ledger should always be called after updating prevdoc status,
# because updating ordered qty in bin depends upon updated ordered qty in PO
@@ -170,9 +167,6 @@
bin = frappe.db.sql("select actual_qty from `tabBin` where item_code = %s and warehouse = %s", (d.rm_item_code, self.supplier_warehouse), as_dict = 1)
d.current_stock = bin and flt(bin[0]['actual_qty']) or 0
- def get_rate(self,arg):
- return frappe.get_doc('Purchase Common').get_rate(arg,self)
-
def get_gl_entries(self, warehouse_account=None):
from erpnext.accounts.general_ledger import process_gl_map
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index a6dd825..b33c6b4 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -388,36 +388,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "eval:doc.docstatus==0",
- "fieldname": "set_posting_time",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Edit Posting Date and Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"default": "Today",
"depends_on": "",
"fieldname": "posting_date",
@@ -481,6 +451,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "set_posting_time",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Edit Posting Date and Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"depends_on": "eval: doc.from_bom && (doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")",
"fieldname": "sb1",
"fieldtype": "Section Break",
@@ -1654,7 +1654,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-03-14 16:11:11.741704",
+ "modified": "2017-04-10 12:01:40.888115",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
@@ -1749,6 +1749,6 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "title",
- "track_changes": 0,
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 79df591..b16dee9 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -44,30 +44,30 @@
make_stock_entry(item_code=item_code, target=warehouse, qty=1, basic_rate=10)
sle = get_sle(item_code = item_code, warehouse = warehouse)[0]
- self.assertEqual([[1, 10]], eval(sle.stock_queue))
+ self.assertEqual([[1, 10]], frappe.safe_eval(sle.stock_queue))
# negative qty
make_stock_entry(item_code=item_code, source=warehouse, qty=2, basic_rate=10)
sle = get_sle(item_code = item_code, warehouse = warehouse)[0]
- self.assertEqual([[-1, 10]], eval(sle.stock_queue))
+ self.assertEqual([[-1, 10]], frappe.safe_eval(sle.stock_queue))
# further negative
make_stock_entry(item_code=item_code, source=warehouse, qty=1)
sle = get_sle(item_code = item_code, warehouse = warehouse)[0]
- self.assertEqual([[-2, 10]], eval(sle.stock_queue))
+ self.assertEqual([[-2, 10]], frappe.safe_eval(sle.stock_queue))
# move stock to positive
make_stock_entry(item_code=item_code, target=warehouse, qty=3, basic_rate=20)
sle = get_sle(item_code = item_code, warehouse = warehouse)[0]
- self.assertEqual([[1, 20]], eval(sle.stock_queue))
+ self.assertEqual([[1, 20]], frappe.safe_eval(sle.stock_queue))
# incoming entry with diff rate
make_stock_entry(item_code=item_code, target=warehouse, qty=1, basic_rate=30)
sle = get_sle(item_code = item_code, warehouse = warehouse)[0]
- self.assertEqual([[1, 20],[1, 30]], eval(sle.stock_queue))
+ self.assertEqual([[1, 20],[1, 30]], frappe.safe_eval(sle.stock_queue))
frappe.db.set_default("allow_negative_stock", 0)
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 958da16..3ada10b 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -270,7 +270,7 @@
if not frappe.db.get_value("Price List",
{"name": args.price_list, args.transaction_type: 1, "enabled": 1}):
throw(_("Price List {0} is disabled or does not exist").format(args.price_list))
- else:
+ elif not args.get("supplier"):
throw(_("Price List not selected"))
def validate_conversion_rate(args, meta):
@@ -327,11 +327,10 @@
@frappe.whitelist()
def get_pos_profile(company):
- condition = "and company = '%s'"%(company) if company else ''
pos_profile = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
- {cond}""".format(cond=condition), (frappe.session['user']), as_dict=1)
+ and company = %s""", (frappe.session['user'], company), as_dict=1)
- if not pos_profile and company:
+ if not pos_profile:
pos_profile = frappe.db.sql("""select * from `tabPOS Profile`
where ifnull(user,'') = '' and company = %s""", company, as_dict=1)
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 948a626..82f9bf1 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -2,7 +2,7 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
from frappe import _
from frappe.utils import cint, flt, cstr, now
from erpnext.stock.utils import get_valuation_method
@@ -258,14 +258,15 @@
if not self.valuation_rate and actual_qty > 0:
self.valuation_rate = sle.incoming_rate
-
+
# Get valuation rate from previous SLE or Item master, if item is not a sample item
if not self.valuation_rate and sle.voucher_detail_no:
is_sample_item = self.check_if_sample_item(sle.voucher_type, sle.voucher_detail_no)
if not is_sample_item:
- self.valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse,
- sle.voucher_type, sle.voucher_no, self.allow_zero_rate)
-
+ self.valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse,
+ sle.voucher_type, sle.voucher_no, self.allow_zero_rate,
+ currency=erpnext.get_company_currency(sle.company))
+
def get_fifo_values(self, sle):
incoming_rate = flt(sle.incoming_rate)
actual_qty = flt(sle.actual_qty)
@@ -291,11 +292,12 @@
# Get valuation rate from last sle if exists or from valuation rate field in item master
is_sample_item = self.check_if_sample_item(sle.voucher_type, sle.voucher_detail_no)
if not is_sample_item:
- _rate = get_valuation_rate(sle.item_code, sle.warehouse,
- sle.voucher_type, sle.voucher_no, self.allow_zero_rate)
+ _rate = get_valuation_rate(sle.item_code, sle.warehouse,
+ sle.voucher_type, sle.voucher_no, self.allow_zero_rate,
+ currency=erpnext.get_company_currency(sle.company))
else:
_rate = 0
-
+
self.stock_queue.append([0, _rate])
index = None
@@ -341,11 +343,11 @@
if not self.stock_queue:
self.stock_queue.append([0, sle.incoming_rate or sle.outgoing_rate or self.valuation_rate])
-
+
def check_if_sample_item(self, voucher_type, voucher_detail_no):
ref_item_dt = voucher_type + (" Detail" if voucher_type == "Stock Entry" else " Item")
return frappe.db.get_value(ref_item_dt, voucher_detail_no, "is_sample_item")
-
+
def get_sle_before_datetime(self):
"""get previous stock ledger entry before current time-bucket"""
return get_stock_ledger_entries(self.args, "<", "desc", "limit 1", for_update=False)
@@ -419,7 +421,8 @@
"order": order
}, previous_sle, as_dict=1, debug=debug)
-def get_valuation_rate(item_code, warehouse, voucher_type, voucher_no, allow_zero_rate=False):
+def get_valuation_rate(item_code, warehouse, voucher_type, voucher_no,
+ allow_zero_rate=False, currency=None):
# Get valuation rate from last sle for the same item and warehouse
last_valuation_rate = frappe.db.sql("""select valuation_rate
from `tabStock Ledger Entry`
@@ -441,6 +444,11 @@
# syste does not found any SLE, then take valuation rate from Item
valuation_rate = frappe.db.get_value("Item", item_code, "valuation_rate")
+ if not valuation_rate:
+ # try in price list
+ valuation_rate = frappe.db.get_value('Item Price',
+ dict(item_code=item_code, buying=1, currency=currency), 'price_list_rate')
+
if not allow_zero_rate and not valuation_rate \
and cint(frappe.db.get_value("Accounts Settings", None, "auto_accounting_for_stock")):
frappe.local.message_log = []
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 476e3a8..6ee0e85 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "naming_series:",
@@ -285,7 +286,7 @@
"columns": 0,
"depends_on": "",
"fieldname": "description",
- "fieldtype": "Text",
+ "fieldtype": "Text Editor",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -607,7 +608,7 @@
"columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "resolution_details",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -808,18 +809,18 @@
"unique": 0
}
],
+ "has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-ticket",
"idx": 7,
"image_view": 0,
"in_create": 0,
- "in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-02-20 13:32:31.898423",
+ "modified": "2017-04-05 21:42:23.740187",
"modified_by": "Administrator",
"module": "Support",
"name": "Issue",
diff --git a/erpnext/templates/includes/projects/project_search_box.html b/erpnext/templates/includes/projects/project_search_box.html
index ab02f0c..96eb10c 100644
--- a/erpnext/templates/includes/projects/project_search_box.html
+++ b/erpnext/templates/includes/projects/project_search_box.html
@@ -1,19 +1,19 @@
<div class="project-search text-muted pull-right">
- <input type="text" id="project-search" placeholder="Quick Search">
- <i class="octicon octicon-search"></i>
+ <input type="text" id="project-search" placeholder="Quick Search">
+ <i class="octicon octicon-search"></i>
</div>
<div class="clearfix pull-right" style="width:300px;">
- <h4 class="project-search-results pull-left"></h4>
- <p class="pull-right">
- <a style="display: none; padding-left:5px;" href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted clear" title="Clear Search" ></a>
- </p>
+ <h4 class="project-search-results pull-left"></h4>
+ <p class="pull-right">
+ <a style="display: none; padding-left:5px;" href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted clear" title="Clear Search" ></a>
+ </p>
</div>
<script>
frappe.ready(function() {
if(get_url_arg("q")){
var txt = get_url_arg("q");
- $(".project-search-results").html("Search results for : " + txt);
+ $(".project-search-results").html("Search results for : " + encodeURIComponent(txt));
$(".clear").toggle(true);
}
var thread = null;
diff --git a/erpnext/templates/pages/demo.html b/erpnext/templates/pages/demo.html
index 108319f..f94a7c4 100644
--- a/erpnext/templates/pages/demo.html
+++ b/erpnext/templates/pages/demo.html
@@ -44,7 +44,7 @@
{% endblock %}
{% block title %}
-{{ _("Login") }}
+{{ _("ERPNext Demo") }}
{% endblock %}
{% block page_content %}
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index c7134b0..d00f535 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -10,7 +10,7 @@
<script>
frappe.ready(function() {
var txt = get_url_arg("search");
- $(".search-results").html("{{ _('Search results for') }}: " + txt);
+ $(".search-results").html("{{ _('Search results for') }}: " + encodeURIComponent(txt));
window.search = txt;
window.start = 0;
window.get_product_list();
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 95d2837..d5d65ac 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -49,7 +49,7 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Eingereicht
DocType: Pricing Rule,Apply On,Anwenden auf
DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
-,Purchase Order Items To Be Received,Eingehende Lieferantenauftrags-Artikel
+,Purchase Order Items To Be Received,Eingehende Bestellungs-Artikel
DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
DocType: Support Settings,Support Settings,Support-Einstellungen
DocType: SMS Parameter,Parameter,Parameter
@@ -325,7 +325,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +877,Material Request,Materialanfrage
DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
DocType: Item,Purchase Details,Einkaufsdetails
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" der Bestellung {1} nicht gefunden"
DocType: Employee,Relation,Beziehung
DocType: Shipping Rule,Worldwide Shipping,Weltweiter Versand
DocType: Student Guardian,Mother,Mutter
@@ -784,7 +784,7 @@
#### Description of Columns
-1. Calculation Type:
+1. Calculation Type:
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
@@ -795,15 +795,15 @@
6. Amount: Tax amount.
7. Total: Cumulative total to this point.
8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten.
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten.
- #### Hinweis
+ #### Hinweis
Der Steuersatz, den sie hier definieren, wird der Standardsteuersatz für alle Artikel. Wenn es Artikel mit davon abweichenden Steuersätzen gibt, müssen diese in der Tabelle ""Artikelsteuer"" im Artikelstamm hinzugefügt werden.
- #### Beschreibung der Spalten
+ #### Beschreibung der Spalten
-1. Berechnungsart:
+1. Berechnungsart:
- Dies kann sein ""Auf Nettosumme"" (das ist die Summe der Grundbeträge).
- ""Auf vorherige Zeilensumme/-Betrag"" (für kumulative Steuern oder Abgaben). Wenn diese Option ausgewählt wird, wird die Steuer als Prozentsatz der vorherigen Zeilesumme/des vorherigen Zeilenbetrags (in der Steuertabelle) angewendet.
- ""Unmittelbar"" (wie bereits erwähnt).
@@ -890,7 +890,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} Status ist {2}
DocType: Employee,Provide Email Address registered in company,Geben Sie E-Mail-Adresse in Unternehmen registriert
DocType: Shopping Cart Settings,Enable Checkout,Aktivieren Kasse
-apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Von Bestellung zur Zahlung
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Geplante Menge
DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
apps/erpnext/erpnext/stock/doctype/item/item.js +340,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
@@ -1002,7 +1002,7 @@
DocType: Job Opening,Publish on website,Veröffentlichen Sie auf der Website
apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Lieferungen an Kunden
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +623,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
-DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
+DocType: Purchase Invoice Item,Purchase Order Item,Bestell-Artikel
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirekte Erträge
DocType: Student Attendance Tool,Student Attendance Tool,Schülerteilnahme Werkzeug
DocType: Cheque Print Template,Date Settings,Datums-Einstellungen
@@ -1017,10 +1017,10 @@
DocType: Pricing Rule,Max Qty,Maximalmenge
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
Please enter a valid Invoice","Row {0}: Rechnung {1} ist ungültig, könnte es abgebrochen werden / nicht vorhanden. \ Bitte geben Sie eine gültige Rechnung"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kunden-/Lieferantenauftrag"" sollte immer als ""Vorkasse"" eingestellt werden"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kundenauftrag / Bestellung"" sollte immer als ""Vorkasse"" eingestellt werden"
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemische Industrie
DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Standard Bank / Geldkonto wird automatisch in Gehalts Journal Entry aktualisiert werden, wenn dieser Modus ausgewählt ist."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades.
+apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades.
Please check intervals {0} and {1} and try again",Die Intervalle für Grade-Code {0} überlappt mit der Note Intervalle für andere Typen. Bitte überprüfen Sie Intervalle {0} und {1} und versuchen Sie es erneut
DocType: BOM,Raw Material Cost(Company Currency),Rohstoffkosten (Gesellschaft Währung)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
@@ -1290,7 +1290,7 @@
DocType: Student Applicant,AP,AP
DocType: Purchase Invoice Item,BOM,Stückliste
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
-DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
+DocType: Journal Entry Account,Purchase Order,Bestellung
DocType: Vehicle,Fuel UOM,Kraftstoff UOM
DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
DocType: Payment Entry,Write Off Difference Amount,Write Off Differenzbetrag
@@ -1541,7 +1541,7 @@
DocType: Loan Type,Maximum Loan Amount,Maximale Darlehensbetrag
DocType: Pricing Rule,Pricing Rule,Preisregel
DocType: Budget,Action if Annual Budget Exceeded,Erwünschte Aktion bei überschrittenem jährlichem Budget
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Von der Materialanfrage zur Bestellung
DocType: Shopping Cart Settings,Payment Success URL,Payment Success URL
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {2} {3}
DocType: Purchase Receipt,PREC-,PREC-
@@ -1552,7 +1552,7 @@
DocType: C-Form,III,III
apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Eröffnungsbestände
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} darf nur einmal vorkommen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Übertragung von mehr {0} als {1} mit Lieferantenauftrag {2} nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Übertragung von mehr {0} als {1} gegen Bestellung {2} nicht erlaubt
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Keine Artikel zum Verpacken
DocType: Shipping Rule Condition,From Value,Von-Wert
@@ -1730,7 +1730,7 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Chance von"" ist zwingend erforderlich"
DocType: Email Digest,Annual Expenses,Jährliche Kosten
DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Make Purchase Order,Bestellung erstellen
DocType: SMS Center,Send To,Senden an
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
DocType: Payment Reconciliation Payment,Allocated amount,Zugewiesene Menge
@@ -2333,7 +2333,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
DocType: Delivery Note,DN-,DN-
DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Drittanbieter/Händler/Kommissionär/verbundenes Unternehmen/Wiederverkäufer, der die Produkte auf Provisionsbasis verkauft."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Purchase Order {1},{0} zu Bestellung {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
DocType: Task,Actual Start Date (via Time Sheet),Das tatsächliche Startdatum (durch Zeiterfassung)
apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
@@ -2346,7 +2346,7 @@
#### Description of Columns
-1. Calculation Type:
+1. Calculation Type:
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
@@ -2358,15 +2358,15 @@
7. Total: Cumulative total to this point.
8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten.
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten.
- #### Hinweis
+ #### Hinweis
Der Steuersatz, den sie hier definieren, wird der Standardsteuersatz für alle Artikel. Wenn es Artikel mit davon abweichenden Steuersätzen gibt, müssen diese in der Tabelle ""Artikelsteuer"" im Artikelstamm hinzugefügt werden.
- #### Beschreibung der Spalten
+ #### Beschreibung der Spalten
-1. Berechnungsart:
+1. Berechnungsart:
- Dies kann sein ""Auf Nettosumme"" (das ist die Summe der Grundbeträge).
- ""Auf vorherige Zeilensumme/-Betrag"" (für kumulative Steuern oder Abgaben). Wenn diese Option ausgewählt wird, wird die Steuer als Prozentsatz der vorherigen Zeilesumme/des vorherigen Zeilenbetrags (in der Steuertabelle) angewendet.
- ""Unmittelbar"" (wie bereits erwähnt).
@@ -2480,7 +2480,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
DocType: Budget,Cost Center,Kostenstelle
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Beleg #
-DocType: Notification Control,Purchase Order Message,Lieferantenauftrags-Nachricht
+DocType: Notification Control,Purchase Order Message,Bestellungs-Nachricht
DocType: Tax Rule,Shipping Country,Zielland der Lieferung
DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ausblenden Kundensteuernummer aus Verkaufstransaktionen
DocType: Upload Attendance,Upload HTML,HTML hochladen
@@ -2490,7 +2490,7 @@
DocType: Employee Education,Class / Percentage,Klasse / Anteil
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Leiter Marketing und Vertrieb
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Einkommensteuer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Lieferantenauftrag etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Bestellung etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
DocType: Item Supplier,Item Supplier,Artikellieferant
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
@@ -2580,7 +2580,7 @@
1. Ways of addressing disputes, indemnity, liability, etc.
1. Address and Contact of your Company.","Allgemeine Geschäftsbedingungen, die bei Ver- und Einkäufen verwendet werden können.
- Beispiele:
+ Beispiele:
1. Gültigkeit des Angebots.
2. Zahlungsbedingungen (Vorkasse, auf Rechnung, Teilweise Vorkasse usw.)
@@ -2589,7 +2589,7 @@
5. Garantie, falls vorhanden.
6. Rückgabebedingungen.
7. Lieferbedingungen, falls zutreffend.
-8. Beschwerdemanagement, Schadensersatz, Haftung usw.
+8. Beschwerdemanagement, Schadensersatz, Haftung usw.
9. Adresse und Kontaktdaten des Unternehmens."
DocType: Attendance,Leave Type,Urlaubstyp
DocType: Purchase Invoice,Supplier Invoice Details,Lieferant Rechnungsdetails
@@ -2879,7 +2879,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +86,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +86,Purchase Order number required for Item {0},Bestellnummer ist für den Artikel {0} erforderlich
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +871,Production Order not created,Fertigungsauftrag nicht erstellt
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
@@ -2986,7 +2986,7 @@
apps/erpnext/erpnext/demo/setup/setup_data.py +314,Calls,Anrufe
DocType: Project,Total Costing Amount (via Time Logs),Gesamtkostenbetrag (über Zeitprotokolle)
DocType: Purchase Order Item Supplied,Stock UOM,Lagermaßeinheit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Purchase Order {0} is not submitted,Bestellung {0} wurde nicht übertragen
DocType: Customs Tariff Number,Tariff Number,Tarifnummer
apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Geplant
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
@@ -3086,7 +3086,7 @@
DocType: Cheque Print Template,Starting position from top edge,Ausgangsposition von der Oberkante
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Same Anbieter wurde mehrmals eingegeben
apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruttogewinn / Verlust
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Lieferantenauftrags-Artikel geliefert
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Bestell-Artikel geliefert
apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Firmenname kann keine Firma sein
apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefköpfe für Druckvorlagen
apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung"
@@ -3103,7 +3103,7 @@
apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Bitte Abschlusskostenstelle in Firma vermerken
DocType: Purchase Invoice,Terms,Geschäftsbedingungen
DocType: Academic Term,Term Name,Zeit Namen
-DocType: Buying Settings,Purchase Order Required,Lieferantenauftrag erforderlich
+DocType: Buying Settings,Purchase Order Required,Bestellung erforderlich
,Item-wise Sales History,Artikelbezogene Verkaufshistorie
DocType: Expense Claim,Total Sanctioned Amount,Summe genehmigter Beträge
,Purchase Analytics,Einkaufsanalyse
@@ -3842,7 +3842,7 @@
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
DocType: Job Applicant,Applicant Name,Bewerbername
DocType: Authorization Rule,Customer / Item Name,Kunde / Artikelname
-DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
@@ -3876,7 +3876,7 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Nettoinventarwert als auf
DocType: Account,Receivable,Forderung
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits ein Lieferantenauftrag vorhanden ist"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist"
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +904,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
apps/erpnext/erpnext/accounts/page/pos/pos.js +909,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
@@ -3977,7 +3977,7 @@
DocType: Purchase Invoice,Raw Materials Supplied,Gelieferte Rohmaterialien
DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
DocType: C-Form,Series,Nummernkreise
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Lieferantenauftrags liegen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum der Bestellung liegen
DocType: Appraisal,Appraisal Template,Bewertungsvorlage
DocType: Item Group,Item Classification,Artikeleinteilung
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Leiter der kaufmännischen Abteilung
@@ -4195,7 +4195,7 @@
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Jahresbeginn oder Enddatum überlappt mit {0}. Um dies zu verhindern setzen Sie eine Firma.
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Beispiel: 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.","Beispiel: ABCD.#####
Wenn ""Serie"" eingestellt ist und ""Seriennummer"" in den Transaktionen nicht aufgeführt ist, dann wird eine Seriennummer automatisch auf der Grundlage dieser Serie erstellt. Wenn immer explizit Seriennummern für diesen Artikel aufgeführt werden sollen, muss das Feld leer gelassen werden."
DocType: Upload Attendance,Upload Attendance,Anwesenheit hochladen
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +302,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
@@ -4286,7 +4286,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Steuervorlage für Einkaufstransaktionen
,Item Prices,Artikelpreise
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern."
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie die Bestellung speichern."
DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg
apps/erpnext/erpnext/config/selling.py +67,Price List master.,Preislisten-Vorlagen
DocType: Task,Review Date,Überprüfungsdatum
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index bdf3ea6..5e5ba73 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -65,7 +65,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Cantidad
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Préstamos (pasivos)
-DocType: Employee Education,Year of Passing,Año de graduación
+DocType: Employee Education,Year of Passing,Año de fallecimiento
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referencia:% s, Código del artículo:% s y el Cliente:% s"
DocType: Item,Country of Origin,País de origen
apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,En inventario
@@ -111,12 +111,12 @@
apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} no en cualquier año fiscal activa.
DocType: Packed Item,Parent Detail docname,Detalle principal docname
apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogramo
-DocType: Student Log,Log,Iniciar sesión
+DocType: Student Log,Log,Log
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
DocType: Item Attribute,Increment,Incremento
apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Seleccione Almacén ...
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company se introduce más de una vez
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La misma Compañia es ingresada mas de una vez
DocType: Employee,Married,Casado
apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obtener artículos de
@@ -130,7 +130,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Siguiente Depreciación La fecha no puede ser anterior a la fecha de compra
DocType: SMS Center,All Sales Person,Todos los vendedores
DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribución mensual ayuda a distribuir el presupuesto / Target a través de meses si tiene la estacionalidad de su negocio.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,Not items found,No artículos encontrados
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,Not items found,No se encontraron artículos
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura salarial
DocType: Lead,Person Name,Nombre de persona
DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
@@ -152,7 +152,7 @@
DocType: SMS Log,SMS Log,Registros SMS
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El día de fiesta en {0} no es entre De la fecha y Hasta la fecha
-DocType: Student Log,Student Log,Iniciar estudiante
+DocType: Student Log,Student Log,Bitácora del Estudiante
DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
DocType: Lead,Interested,Interesado
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Apertura
@@ -187,7 +187,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumible
DocType: Employee,B-,B-
DocType: Upload Attendance,Import Log,Importar registro
-DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tire Solicitud de materiales de tipo Fabricación en base a los criterios anteriores
+DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Traer Solicitud de materiales de tipo Fabricación en base a los criterios anteriores
DocType: Training Result Employee,Grade,Grado
DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
DocType: SMS Center,All Contact,Todos los Contactos
@@ -229,7 +229,7 @@
DocType: Serial No,Maintenance Status,Estado del mantenimiento
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: se requiere un proveedor para la cuenta por pagar {2}
apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Productos y precios
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total horas: {0}
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Horas totales: {0}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
DocType: Customer,Individual,Individual
DocType: Interest,Academics User,académicos usuario
@@ -238,7 +238,7 @@
apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas
DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje
DocType: POS Profile,Customer Groups,Grupos de clientes
-DocType: Guardian,Students,Los estudiantes
+DocType: Guardian,Students,Estudiantes
apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos.
apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La lista de precios debe ser aplicable para las compras o ventas
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
@@ -265,7 +265,7 @@
apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},cantidad de avance no puede ser mayor que {0} {1}
DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
DocType: Company,Default Payroll Payable Account,La nómina predeterminada de la cuenta por pagar
-apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Grupo alerta por correo electrónico
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Editar Grupo de Correo Electrónico
DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es aplicable
DocType: Course Schedule,Instructor Name,Nombre instructor
@@ -277,11 +277,11 @@
DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
,Production Orders in Progress,Órdenes de producción en progreso
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectivo neto de financiación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2179,"LocalStorage is full , did not save","LocalStorage está lleno, no salvó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2179,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
DocType: Lead,Address & Contact,Dirección y Contacto
DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
-DocType: Sales Partner,Partner website,sitio web de colaboradores
+DocType: Sales Partner,Partner website,Sitio web de colaboradores
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Añadir artículo
,Contact Name,Nombre de contacto
DocType: Course Assessment Criteria,Course Assessment Criteria,Criterios de evaluación del curso
@@ -316,7 +316,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Desarrollador de Software.
DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
DocType: Pricing Rule,Supplier Type,Tipo de proveedor
-DocType: Course Scheduling Tool,Course Start Date,Curso Fecha de Inicio
+DocType: Course Scheduling Tool,Course Start Date,Fecha de inicio del Curso
,Student Batch-Wise Attendance,Discontinuo asistencia de los estudiantes
DocType: POS Profile,Allow user to edit Rate,Permitir al usuario editar Tasa
DocType: Item,Publish in Hub,Publicar en el Hub
@@ -528,7 +528,7 @@
apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
apps/erpnext/erpnext/stock/doctype/item/item.py +535,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
DocType: Shipping Rule,Net Weight,Peso neto
DocType: Employee,Emergency Phone,Teléfono de emergencia
@@ -584,7 +584,7 @@
DocType: C-Form Invoice Detail,Grand Total,Total
DocType: Training Event,Course,Curso
DocType: Timesheet,Payslip,recibo de sueldo
-apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Cesta de artículos
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Articulo de Carrito de Compras
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
DocType: Issue,Resolution,Resolución
DocType: C-Form,IV,IV
@@ -611,7 +611,7 @@
DocType: Training Result Employee,Training Result Employee,Empleado Formación Resultado
DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Almacén lógico contra el que se crean las entradas de inventario
DocType: Repayment Schedule,Principal Amount,Cantidad principal
-DocType: Employee Loan Application,Total Payable Interest,El interés total a pagar
+DocType: Employee Loan Application,Total Payable Interest,Interés Total a Pagar
DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venta de partes de horas
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar la cuenta de pago para hacer la entrada del Banco
@@ -634,7 +634,7 @@
DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
DocType: Employee,Organization Profile,Perfil de la organización
DocType: Student,Sibling Details,Detalles de hermanos
-DocType: Vehicle Service,Vehicle Service,Servicio en el vehículo
+DocType: Vehicle Service,Vehicle Service,Servicio del Vehículo
apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,desencadena automáticamente la solicitud de realimentación sobre la base de condiciones.
DocType: Employee,Reason for Resignation,Motivo de la renuncia
apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
@@ -690,7 +690,7 @@
DocType: Item,Material Transfer,Transferencia de material
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +210,Opening (Dr),Apertura (Deb)
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
-DocType: Employee Loan,Total Interest Payable,El interés total a pagar
+DocType: Employee Loan,Total Interest Payable,Interés total a pagar
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
DocType: Production Order Operation,Actual Start Time,Hora de inicio real
DocType: BOM Operation,Operation Time,Tiempo de operación
@@ -711,7 +711,7 @@
DocType: Interest,Interest,Interesar
apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre ventas
DocType: Purchase Receipt,Other Details,Otros detalles
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Proveedor
DocType: Account,Accounts,Cuentas
DocType: Vehicle,Odometer Value (Last),Valor del cuentakilómetros (Última)
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
@@ -749,7 +749,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo circulante
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} no es un artículo en existencia
DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
-DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (Compañía de divisas)
+DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (Divisa de Compañia)
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
@@ -852,7 +852,7 @@
DocType: Warehouse,Tree Details,Detalles del árbol
DocType: Training Event,Event Status,Estado de eventos
,Support Analytics,Soporte analítico
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Si usted tiene alguna pregunta, por favor volver a nosotros."
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Si usted tiene alguna pregunta, por favor consultenos."
DocType: Item,Website Warehouse,Almacén para el sitio web
DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: El centro de costos {2} no pertenece a la empresa {3}
@@ -896,10 +896,10 @@
DocType: Sales Invoice,Payment Due Date,Fecha de pago
apps/erpnext/erpnext/stock/doctype/item/item.js +340,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Apertura'
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Abierto a hacer
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Lista de tareas abiertas
DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
DocType: Expense Claim,Expenses,Gastos
-DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo
+DocType: Item Variant Attribute,Item Variant Attribute,Atributo de Variante de Producto
,Purchase Receipt Trends,Tendencias de recibos de compra
DocType: Process Payroll,Bimonthly,Bimensual
DocType: Vehicle Service,Brake Pad,Pastilla de freno
@@ -995,7 +995,7 @@
DocType: Salary Slip,Total in words,Total en palabras
DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
DocType: Guardian,Guardian Name,Nombre tutor
-DocType: Cheque Print Template,Has Print Format,Formato de impresión tiene
+DocType: Cheque Print Template,Has Print Format,Tiene Formato de Impresión
DocType: Employee Loan,Sanctioned,Sancionada
apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Posiblemente el registro de cambio de divisa no ha sido creado para
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +103,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}"
@@ -1047,7 +1047,7 @@
DocType: Lead,Next Contact Date,Siguiente fecha de contacto
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de apertura
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
-DocType: Student Batch,Student Batch Name,Lote Nombre del estudiante
+DocType: Student Batch,Student Batch Name,Nombre de Lote del Estudiante
DocType: Holiday List,Holiday List Name,Nombre de festividad
DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstamo Monto
apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendario de Cursos
@@ -1086,7 +1086,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
DocType: Serial No,Creation Document No,Creación del documento No
DocType: Issue,Issue,Asunto
-DocType: Asset,Scrapped,desechado
+DocType: Asset,Scrapped,Desechado
apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,La cuenta no coincide con la empresa
apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para Elementos variables. por ejemplo, tamaño, color, etc."
DocType: Purchase Invoice,Returns,Devoluciones
@@ -1178,7 +1178,7 @@
DocType: Sales Invoice Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Por favor, introduzca el código de artículo para obtener el número de lote"
DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
-DocType: Employee Loan,Partially Disbursed,parcialmente Desembolso
+DocType: Employee Loan,Partially Disbursed,Parcialmente Desembolsado
DocType: Grading Structure,Grading System Name,Nombre del sistema de clasificación
apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
DocType: Account,Balance Sheet,Hoja de balance
@@ -1200,7 +1200,7 @@
DocType: Holiday,Holiday,Vacaciones
DocType: Support Settings,Close Issue After Days,Cerrar Problema Después Días
DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las sucursales
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma no es aplicable para la factura: {0}
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},Formulario-C no es aplicable para la factura: {0}
DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
DocType: Purchase Order,Group same items,Grupo mismos artículos
@@ -1223,7 +1223,7 @@
DocType: Grading Scale,Intervals,intervalos
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
apps/erpnext/erpnext/stock/doctype/item/item.py +509,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
-apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nº de Estudiantes móvil
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Número de Móvil del Estudiante.
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Resto del mundo
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
,Budget Variance Report,Variación de Presupuesto
@@ -1235,7 +1235,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,UTILIDADES RETENIDAS
DocType: Vehicle Log,Service Detail,Detalle del servicio
DocType: BOM,Item Description,Descripción del producto
-DocType: Student Sibling,Student Sibling,hermano del estudiante
+DocType: Student Sibling,Student Sibling,Hermano del Estudiante
DocType: Purchase Invoice,Is Recurring,Es recurrente
DocType: Purchase Invoice,Supplied Items,Productos suministrados
DocType: Student,STUD.,SEMENTAL.
@@ -1308,7 +1308,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
DocType: Hub Settings,Seller Website,Sitio web del vendedor
-DocType: Item,ITEM-,ÍT-
+DocType: Item,ITEM-,ITEM-
apps/erpnext/erpnext/controllers/selling_controller.py +152,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},El estado de la orden de producción es {0}
DocType: Appraisal Goal,Goal,Meta/Objetivo
@@ -1362,11 +1362,11 @@
apps/erpnext/erpnext/demo/setup/setup_data.py +315,Food,Comida
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
DocType: Maintenance Schedule Item,No of Visits,Número de visitas
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Marcos Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Marcar Asistencia
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,estudiante que se inscribe
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La divisa / moneda de la cuenta de cierre debe ser {0}
apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para los objetivos debe ser 100. y es {0}
-DocType: Project,Start and End Dates,Las fechas de inicio y fin
+DocType: Project,Start and End Dates,Fechas de Inicio y Fin
,Delivered Items To Be Billed,Envios por facturar
apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Abrir la lista de materiales {0}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
@@ -1391,7 +1391,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado"""
DocType: Purchase Invoice,Contact Person,Persona de contacto
apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Fecha esperada de inicio' no puede ser mayor que 'Fecha esperada de finalización'
-DocType: Course Scheduling Tool,Course End Date,Curso Fecha de finalización
+DocType: Course Scheduling Tool,Course End Date,Fecha de finalización del curso
DocType: Holiday List,Holidays,Vacaciones
DocType: Sales Order Item,Planned Quantity,Cantidad planificada
DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
@@ -1400,7 +1400,7 @@
DocType: Employee,Prefered Email,preferido por correo electrónico
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Cambio neto en activos fijos
DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Almacén es obligatorio para las cuentas no grupales de tipo de archivo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Almacén es obligatorio para las cuentas no grupales de tipo Stock
apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Máximo: {0}
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de fecha y hora
@@ -1428,7 +1428,7 @@
DocType: HR Settings,Employee Settings,Configuración de empleado
,Batch-Wise Balance History,Historial de saldo por lotes
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Los ajustes de impresión actualizados en formato de impresión respectivo
-DocType: Package Code,Package Code,Código paquete
+DocType: Package Code,Package Code,Código de paquete
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Aprendiz
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,No se permiten cantidades negativas
DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1447,14 +1447,14 @@
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar P & L saldos sin cerrar el año fiscal
DocType: Shipping Rule,Shipping Account,Cuenta de envíos
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: La cuenta {2} está inactiva
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Hacen pedidos de cliente para ayudarle a planificar su trabajo y entrega del tiempo de funcionamiento
+apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Hacer Ordenes de Ventas para ayudar a planificar tu trabajo y entregar en tiempo
DocType: Quality Inspection,Readings,Lecturas
DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
DocType: Course Schedule,SH,SH
DocType: BOM,Scrap Material Cost(Company Currency),El costo del desecho de materiales (Compañía de divisas)
apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub-Ensamblajes
DocType: Asset,Asset Name,Nombre de activos
-DocType: Project,Task Weight,Peso de tareas
+DocType: Project,Task Weight,Peso de la Tarea
DocType: Shipping Rule Condition,To Value,Para el valor
DocType: Asset Movement,Stock Manager,Gerente de almacén
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
@@ -1467,7 +1467,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analista
DocType: Item,Inventory,inventario
DocType: Item,Sales Details,Detalles de ventas
-DocType: Quality Inspection,QI-,qi
+DocType: Quality Inspection,QI-,QI-
DocType: Opportunity,With Items,Con productos
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En cantidad
DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
@@ -1487,7 +1487,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No se encontraron registros en la tabla de pagos
apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este {0} conflictos con {1} de {2} {3}
-DocType: Student Attendance Tool,Students HTML,Los estudiantes HTML
+DocType: Student Attendance Tool,Students HTML,HTML de Estudiantes
apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Inicio del ejercicio contable
DocType: POS Profile,Apply Discount,Aplicar Descuento
DocType: Employee External Work History,Total Experience,Experiencia total
@@ -1563,7 +1563,7 @@
DocType: Quality Inspection Reading,Reading 4,Lectura 4
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM por defecto para {0} no encontrado para Proyecto {1}
apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Los estudiantes están en el corazón del sistema, se suman todos sus estudiantes"
+apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Los estudiantes son el corazón del sistema, agrega todos tus estudiantes"
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: Fecha de Liquidación {1} no puede ser anterior Cheque Fecha {2}
DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del tiempo y Tiempo de {1} se solapan con {2}
@@ -1614,7 +1614,7 @@
DocType: Party Account,Party Account,Cuenta asignada
apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos humanos
DocType: Lead,Upper Income,Ingresos superior
-DocType: Item Manufacturer,Item Manufacturer,artículo Fabricante
+DocType: Item Manufacturer,Item Manufacturer,Fabricante del artículo
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Rechazar
DocType: Journal Entry Account,Debit in Company Currency,Divisa por defecto de la cuenta de débito
DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
@@ -1623,7 +1623,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe debitar
DocType: Company,Default Values,Valores predeterminados
DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esto se basa en los registros contra este vehículo. Ver cronología abajo para más detalles
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esta basado en registros contra este Vehículo. Ver el cronograma debajo para más detalles
apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Recoger
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
DocType: Customer,Default Price List,Lista de precios por defecto
@@ -1636,7 +1636,7 @@
apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,la fijación de precios
DocType: Quotation,Term Details,Detalles de términos y condiciones
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes de este grupo de estudiantes.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes para este grupo de estudiantes.
apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Obtención
@@ -1650,7 +1650,7 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro entrado debe ser mayor que el cuentakilómetros inicial {0}
DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Deja y Asistencia
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ausencia y Asistencia
DocType: Maintenance Visit,Partially Completed,Parcialmente completado
DocType: Leave Type,Include holidays within leaves as leaves,Incluir las vacaciones y ausencias únicamente como ausencias
DocType: Sales Invoice,Packed Items,Productos Empacados
@@ -1662,7 +1662,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,"Advance paid against {0} {1} cannot be greater \
than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2}
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto"
-DocType: Student Sibling,Studying in Same Institute,Estudiar en el mismo Instituto
+DocType: Student Sibling,Studying in Same Institute,Estudian en el mismo Instituto
DocType: Territory,Territory Manager,Gerente de Territorio
DocType: Packed Item,To Warehouse (Optional),Para almacenes (Opcional)
DocType: Payment Entry,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
@@ -1671,7 +1671,7 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en línea
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,Cumplimiento
-apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver Carrito
+apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver en Carrito
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,GASTOS DE PUBLICIDAD
,Item Shortage Report,Reporte de productos con stock bajo
apps/erpnext/erpnext/stock/doctype/item/item.js +256,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
@@ -1715,7 +1715,7 @@
DocType: Program Course,Required,Necesario
DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
DocType: Production Plan Material Request,Production Plan Material Request,Producción Solicitud Plan de materiales
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción (OP)
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No se crearon Ordenes de Producción
DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
DocType: Purchase Invoice Item,Batch No,Lote No.
@@ -1754,7 +1754,7 @@
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente por la suma del peso neto de los materiales)
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,Por favor crea una cuenta para este almacén y vincularlo. Esto no se puede hacer automáticamente como una cuenta con el nombre {0} ya existe
DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
-DocType: Student Batch,Instructors,Los instructores
+DocType: Student Batch,Instructors,Instructores
DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
DocType: Authorization Control,Authorization Control,Control de Autorización
@@ -1779,12 +1779,12 @@
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociado
DocType: Asset Movement,Asset Movement,Movimiento activo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2031,New Cart,nuevo carro
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2031,New Cart,Nuevo Carrito
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
DocType: SMS Center,Create Receiver List,Crear lista de receptores
DocType: Vehicle,Wheels,ruedas
DocType: Packing Slip,To Package No.,Al paquete No.
-DocType: Production Planning Tool,Material Requests,Las solicitudes de materiales
+DocType: Production Planning Tool,Material Requests,Solicitudes de Material
DocType: Warranty Claim,Issue Date,Fecha de emisión
DocType: Activity Cost,Activity Cost,Costo de Actividad
DocType: Sales Invoice Timesheet,Timesheet Detail,Detalle de parte de horas
@@ -1881,14 +1881,14 @@
DocType: Item Attribute,Attribute Name,Nombre del Atributo
DocType: BOM,Show In Website,Mostrar en el sitio web
DocType: Shopping Cart Settings,Show Quantity in Website,Cantidad mostrar en la Página Web
-DocType: Employee Loan Application,Total Payable Amount,La cantidad total a pagar
+DocType: Employee Loan Application,Total Payable Amount,Monto Total a Pagar
DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
DocType: Item Reorder,Check in (group),El proceso de registro (grupo)
,Qty to Order,Cantidad a solicitar
DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","El cabezal cuenta bajo pasivo o patrimonio, en el que será reservado Ganancia / Pérdida"
apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagrama Gantt de todas las tareas.
DocType: Opportunity,Mins to First Response,Minutos hasta la primera respuesta
-DocType: Pricing Rule,Margin Type,Tipo margen
+DocType: Pricing Rule,Margin Type,Tipo de margen
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} horas
DocType: Course,Default Grading Scale,Escala de Calificación por defecto
DocType: Appraisal,For Employee Name,Por nombre de empleado
@@ -1911,7 +1911,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +887,Select BOM and Qty for Production,Seleccione la lista de materiales y de Unidades de Producción
DocType: Asset,Depreciation Schedule,Programación de la depreciación
DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Medio día de la fecha debe estar entre De la fecha y Hasta la fecha
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Fecha de medio día debe estar entre la fecha desde y fecha hasta
DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
DocType: Item,Has Batch No,Posee número de lote
apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Facturación anual: {0}
@@ -1958,7 +1958,7 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
DocType: Loan Type,Loan Name,Nombre del préstamo
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
-DocType: Student Siblings,Student Siblings,Los hermanos de los estudiantes
+DocType: Student Siblings,Student Siblings,Hermanos del Estudiante
apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unidad(es)
apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Por favor, especifique la compañía"
,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
@@ -2020,7 +2020,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
apps/erpnext/erpnext/hooks.py +87,Shipments,Envíos
-DocType: Payment Entry,Total Allocated Amount (Company Currency),Total asignado (Compañía de divisas)
+DocType: Payment Entry,Total Allocated Amount (Company Currency),Monto Total asignado (Divisa de la Compañia)
DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
DocType: BOM,Scrap Material Cost,Costo de materiales de desecho
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
@@ -2049,7 +2049,7 @@
DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
DocType: Student Guardian,Others,Otros
DocType: Payment Entry,Unallocated Amount,Monto sin asignar
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Si no encuentra un artículo a juego. Por favor seleccione otro valor para {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,No se peude encontrar un artículo que concuerde. Por favor seleccione otro valor para {0}.
DocType: POS Profile,Taxes and Charges,Impuestos y cargos
DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No hay más actualizaciones
@@ -2073,7 +2073,7 @@
DocType: Employee Loan,Account Info,Informacion de cuenta
DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
DocType: Sales Invoice,Total Billing Amount,Importe total de facturación
-apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,"Tiene que haber un defecto de entrada cuenta de correo electrónico habilitado para que esto funcione. Por favor, configurar una cuenta de correo electrónico entrante por defecto (POP / IMAP) y vuelve a intentarlo."
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Tiene que haber una cuenta de correo electrónico habilitada por defecto para que esto funcione. Por favor configure una cuenta entrante de correo electrónico por defecto (POP / IMAP) y vuelve a intentarlo.
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Cuenta por cobrar
apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} de activos ya es {2}
DocType: Quotation Item,Stock Balance,Balance de Inventarios.
@@ -2149,9 +2149,9 @@
DocType: Bin,Actual Quantity,Cantidad real
DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,lote estudiante
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Lote de Estudiante
apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sus clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,hacer Estudiante
+apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Crear Estudiante
apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
DocType: Leave Block List Date,Block Date,Bloquear fecha
apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplica ya
@@ -2220,7 +2220,7 @@
DocType: Stock Entry,Purchase Receipt No,Recibo de compra No.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS
DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,trazabilidad
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Trazabilidad
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Origen de fondos (Pasivo)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
DocType: Appraisal,Employee,Empleado
@@ -2270,7 +2270,7 @@
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Asiento Rápida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Asiento Contable Rápido
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Grupo de Estudiantes existe con el mismo nombre
DocType: Employee,Previous Work Experience,Experiencia laboral previa
@@ -2309,7 +2309,7 @@
apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de lista de materiales
DocType: Student,Joining Date,Dia de ingreso
,Employees working on a holiday,Los empleados que trabajan en un día festivo
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marcos Presente
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marcar Presente
DocType: Project,% Complete Method,% Método completado
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
DocType: Production Order,Actual End Date,Fecha Real de Finalización
@@ -2320,7 +2320,7 @@
DocType: Company,Fixed Asset Depreciation Settings,Configuración de depreciación de los inmuebles
DocType: Item,Will also apply for variants unless overrridden,También se aplicará para las variantes menos que se sobre escriba
DocType: Purchase Invoice,Advances,Anticipos
-DocType: Production Order,Manufacture against Material Request,Fabricación contra pedido Material
+DocType: Production Order,Manufacture against Material Request,Fabricación contra Pedido de Material
DocType: Item Reorder,Request for,solicitud de
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Precio base (según la UdM)
@@ -2337,7 +2337,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Purchase Order {1},{0} contra la orden de compra {1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
DocType: Task,Actual Start Date (via Time Sheet),Fecha de inicio real (a través de hoja de horas)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web de ejemplo generado automáticamente por ERPNext
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1
DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -2448,17 +2448,17 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,documento de recepción debe ser presentado
DocType: Purchase Invoice Item,Received Qty,Cantidad recibida
DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"No satisfechos, y no entregados"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,No pago y no entregado
DocType: Product Bundle,Parent Item,Producto padre / principal
DocType: Account,Account Type,Tipo de cuenta
DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,De listas de asistencia
+apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,No hay hojas de tiempo
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deja tipo {0} no se pueden reenviar-llevar
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
,To Produce,Producir
apps/erpnext/erpnext/config/hr.py +93,Payroll,Nómina de sueldos
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,hacer usuario
+apps/erpnext/erpnext/utilities/activation.py +102,Make User,Crear Usuario
DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
DocType: Bin,Reserved Quantity,Cantidad Reservada
DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
@@ -2473,10 +2473,10 @@
DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Los lotes de los estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
-DocType: Payment Entry,Total Allocated Amount,Total asignado
+DocType: Payment Entry,Total Allocated Amount,Monto Total Asignado
DocType: Item Reorder,Material Request Type,Tipo de requisición
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Entrada de diario Accural para salarios de {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +768,"LocalStorage is full, did not save","LocalStorage está llena, no salvó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +768,"LocalStorage is full, did not save","Almacenamiento Local esta lleno, no se guardó"
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
DocType: Budget,Cost Center,Centro de costos
@@ -2508,7 +2508,7 @@
DocType: Supplier Quotation,SQTN-,SQTN-
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre del nuevo centro de costes
DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
-DocType: Project,Task Completion,La terminación de la tarea
+DocType: Project,Task Completion,Completitud de Tarea
apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,No disponible en stock
DocType: Appraisal,HR User,Usuario de recursos humanos
DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y cargos deducidos
@@ -2534,7 +2534,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Grande
-DocType: Homepage Featured Product,Homepage Featured Product,Página de inicio Producto destacado
+DocType: Homepage Featured Product,Homepage Featured Product,Producto destacado en página de inicio
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Todos los grupos de evaluación
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Almacén nuevo nombre
apps/erpnext/erpnext/accounts/report/financial_statements.py +218,Total {0} ({1}),Total {0} ({1})
@@ -2600,8 +2600,8 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} no asociada a {2} {3}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión)
-,Salary Register,salario Registro
-DocType: Warehouse,Parent Warehouse,Almacén de los padres
+,Salary Register,Registro de Salario
+DocType: Warehouse,Parent Warehouse,Almacén Padre
DocType: C-Form Invoice Detail,Net Total,Total Neto
apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir varios tipos de préstamos
DocType: Bin,FCFS Rate,Cambio FCFS
@@ -2670,13 +2670,13 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,La cuenta {0} está congelada
DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
-DocType: Payment Request,Mute Email,Silenciar Email
+DocType: Payment Request,Mute Email,Email Silenciado
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
apps/erpnext/erpnext/controllers/selling_controller.py +131,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
DocType: Stock Entry,Subcontract,Sub-contrato
apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Por favor, introduzca {0} primero"
-apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,No hay respuestas desde
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,No hay respuestas de
DocType: Production Order Operation,Actual End Time,Hora final real
DocType: Production Planning Tool,Download Materials Required,Descargar materiales necesarios
DocType: Item Manufacturer,Manufacturer Part Number,Número de componente del fabricante
@@ -2704,7 +2704,7 @@
DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantener Horas y horas de trabajo de facturación igual en parte de horas
DocType: Maintenance Visit Purpose,Against Document No,Contra el Documento No
-DocType: BOM,Scrap,Chatarra
+DocType: BOM,Scrap,Desecho
apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar socios de ventas.
DocType: Quality Inspection,Inspection Type,Tipo de inspección
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
@@ -2734,7 +2734,7 @@
DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
DocType: Expense Claim,Expense Approver,Supervisor de gastos
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +124,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
-apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,No al Grupo Grupo
+apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,No-Grupo a Grupo
DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
DocType: Payment Entry,Pay,Pagar
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para fecha y hora
@@ -2761,7 +2761,7 @@
DocType: Purchase Invoice Item,Accepted Warehouse,Almacén Aceptado
DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
DocType: Item,Valuation Method,Método de valoración
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Medio Día Marcos
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marcar Medio Día
DocType: Sales Invoice,Sales Team,Equipo de ventas
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entrada duplicada
DocType: Program Enrollment Tool,Get Students,Obtener estudiantes
@@ -2770,7 +2770,7 @@
DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
,Employee Birthday,Cumpleaños del empleado
DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Herramienta de lotes de Asistencia del Estudiante
-apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,límite cruzadas
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,Límite Cruzado
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de riesgo
apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un término académico con esto 'Año Académico' {0} y 'Nombre término' {1} ya existe. Por favor, modificar estas entradas y vuelva a intentarlo."
apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
@@ -2805,7 +2805,7 @@
DocType: GL Entry,Voucher No,Comprobante No.
DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
DocType: Payment Request,Recipient Message And Payment Details,Mensaje receptor y formas de pago
-DocType: Training Event,Trainer Email,entrenador correo electrónico
+DocType: Training Event,Trainer Email,Correo electrónico del entrenador
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Requisición de materiales {0} creada
DocType: Production Planning Tool,Include sub-contracted raw materials,Incluya materias primas subcontratados
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
@@ -2854,7 +2854,7 @@
DocType: Sales Invoice,Write Off Outstanding Amount,Balance de pagos pendientes
DocType: Student Batch Creation Tool,Student Batch Creation Tool,Herramienta de Creación de lotes estudiante
DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario
-DocType: Asset,Number of Depreciations Booked,Número de reserva Depreciaciones
+DocType: Asset,Number of Depreciations Booked,Cantidad de Depreciaciones Reservadas
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Préstamo contra del empleado: {0}
DocType: Landed Cost Item,Receipt Document,la recepción de documentos
DocType: Production Planning Tool,Create Material Requests,Crear requisición de materiales
@@ -2868,7 +2868,7 @@
DocType: Student Guardian,Father,Padre
apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,'Actualización de Inventario' no se puede comprobar en venta de activos fijos
DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
-DocType: Attendance,On Leave,en licencia
+DocType: Attendance,On Leave,De licencia
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener actualizaciones
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: La cuenta {2} no pertenece a la empresa {3}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
@@ -2972,7 +2972,7 @@
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transferencia bancaria
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Marque todas las
-DocType: Vehicle Log,Invoice Ref,Ref factura
+DocType: Vehicle Log,Invoice Ref,Referencia de Factura
DocType: Purchase Order,Recurring Order,Orden recurrente
DocType: Company,Default Income Account,Cuenta de ingresos por defecto
apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
@@ -3016,7 +3016,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,por ejemplo IVA
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
DocType: Student Admission,Admission End Date,La entrada Fecha de finalización
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,La subcontratación
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Subcontratación
DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Estudiantes
DocType: Shopping Cart Settings,Quotation Series,Series de Presupuestos
@@ -3037,7 +3037,7 @@
DocType: Student,Siblings,Los hermanos
DocType: Journal Entry,Stock Entry,Entradas de inventario
DocType: Payment Entry,Payment References,Referencias de pago
-DocType: C-Form,C-FORM-,C-FORM
+DocType: C-Form,C-FORM-,Formulario-C
DocType: Vehicle,Insurance Details,Detalles de Seguros
DocType: Account,Payable,Pagadero
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, introduzca plazos de amortización"
@@ -3096,7 +3096,7 @@
DocType: POS Profile,Update Stock,Actualizar el Inventario
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
-DocType: Asset,Journal Entry for Scrap,Entrada de diario de la chatarra
+DocType: Asset,Journal Entry for Scrap,Entrada de diario para desguace
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registro de todas las comunicaciones: correo electrónico, teléfono, chats, visitas, etc."
@@ -3156,13 +3156,13 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,"Por favor, seleccione Fecha de entrada antes de seleccionar la fiesta"
DocType: Program Enrollment,School House,Casa de la escuela
DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones reserva no puede ser mayor que el número total de amortizaciones
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,Make Maintenance Visit,Crear visita de mantenimiento
apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Esto se basa en la presencia de este Estudiante
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Añadir más elementos o forma totalmente abierta
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basado en la asistencia de este estudiante
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Añadir más elementos o abrir formulario completo
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
@@ -3247,7 +3247,7 @@
DocType: Employee,Offer Date,Fecha de oferta
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Presupuestos
apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,No hay grupos de estudiantes crearon.
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,No se crearon grupos de estudiantes.
DocType: Purchase Invoice Item,Serial No,Número de serie
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad Mensual La devolución no puede ser mayor que Monto del préstamo
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
@@ -3266,10 +3266,10 @@
apps/erpnext/erpnext/hooks.py +111,Request for Quotations,Solicitud de Presupuestos
DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo Factura
DocType: Item,Device Package Code,Dispositivo Código Paquete
-DocType: Student Language,Student Language,idioma del estudiante
+DocType: Student Language,Student Language,Idioma del Estudiante
apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
DocType: Student Sibling,Institution,Institución
-DocType: Asset,Partially Depreciated,parcialmente depreciables
+DocType: Asset,Partially Depreciated,Despreciables Parcialmente
DocType: Issue,Opening Time,Hora de apertura
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
@@ -3311,7 +3311,7 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Nóminas creadas
DocType: Item,Item Code for Suppliers,Código del producto para proveedores
DocType: Issue,Raised By (Email),Propuesto por (Email)
-DocType: Training Event,Trainer Name,Nombre entrenador
+DocType: Training Event,Trainer Name,Nombre del entrenador
DocType: Mode of Payment,General,General
apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar membrete
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
@@ -3338,7 +3338,7 @@
using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra
DocType: Lead,Lead Type,Tipo de iniciativa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar ausencias en fechas bloqueadas
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +364,All these items have already been invoiced,Todos estos elementos ya fueron facturados
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
DocType: Item,Default Material Request Type,El material predeterminado Tipo de solicitud
@@ -3349,13 +3349,13 @@
DocType: Payment Entry,Received Amount,Cantidad recibida
DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear para la cantidad completa, haciendo caso omiso de la cantidad que ya están en orden"
DocType: Account,Tax,Impuesto
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,no Marcado
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,No Marcado
DocType: Production Planning Tool,Production Planning Tool,Planificar producción
DocType: Quality Inspection,Report Date,Fecha del reporte
DocType: Student,Middle Name,Segundo nombre
DocType: C-Form,Invoices,Facturas
DocType: Job Opening,Job Title,Título del trabajo
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,crear usuarios
+apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Crear usuarios
apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramo
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Reporte de visitas para mantenimiento
@@ -3433,7 +3433,7 @@
DocType: Naming Series,Setup Series,Configurar secuencias
DocType: Payment Reconciliation,To Invoice Date,Para Factura Fecha
DocType: Supplier,Contact HTML,HTML de Contacto
-,Inactive Customers,Los clientes inactivos
+,Inactive Customers,Clientes Inactivos
DocType: Landed Cost Voucher,LCV,LCV
DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la regla precios?
@@ -3453,7 +3453,7 @@
DocType: Payment Entry,Account Paid From,De cuenta de pago
DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
DocType: Journal Entry,Write Off Based On,Desajuste basado en
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,hacer plomo
+apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Hacer una Iniciativa
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impresión y papelería
DocType: Stock Settings,Show Barcode Field,Mostrar Campo de código de barras
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
@@ -3497,13 +3497,13 @@
DocType: Production Order,Scrap Warehouse,Almacén de chatarra
DocType: Program Enrollment Tool,Get Students From,Recibe estudiantes de
DocType: Hub Settings,Seller Country,País de vendedor
-apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar artículos por página web
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar artículos en la página web
apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Agrupar sus estudiantes en lotes
DocType: Authorization Rule,Authorization Rule,Regla de Autorización
DocType: Sales Invoice,Terms and Conditions Details,Detalle de términos y condiciones
apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Especificaciones
DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Crédito total)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Crédito)
DocType: Repayment Schedule,Payment Date,Fecha de pago
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de orden
@@ -3551,7 +3551,7 @@
DocType: Program Enrollment Tool,Student Applicants,Los solicitantes de los estudiantes
apps/erpnext/erpnext/setup/doctype/company/company.js +61,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha
-DocType: Appraisal,HR,HORA
+DocType: Appraisal,HR,HR
DocType: Program Enrollment,Enrollment Date,Fecha de inscripción
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Período de prueba
apps/erpnext/erpnext/config/hr.py +115,Salary Components,componentes de sueldos
@@ -3570,7 +3570,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Cantidad debe ser mayor que 0
DocType: Journal Entry,Cash Entry,Entrada de caja
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Los nodos hijos sólo pueden ser creados bajo los nodos de tipo "grupo"
-DocType: Leave Application,Half Day Date,Medio Día Fecha
+DocType: Leave Application,Half Day Date,Fecha de Medio Día
DocType: Academic Year,Academic Year Name,Nombre Año Académico
DocType: Sales Partner,Contact Desc,Desc. de Contacto
apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc."
@@ -3578,7 +3578,7 @@
DocType: Payment Entry,PE-,EDUCACIÓN FÍSICA-
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Por favor, establece de forma predeterminada en cuenta Tipo de Gastos {0}"
DocType: Assessment Result,Student Name,Nombre del estudiante
-DocType: Brand,Item Manager,Administración de elementos
+DocType: Brand,Item Manager,Administración de artículos
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,nómina por pagar
DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
@@ -3596,7 +3596,7 @@
DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
,Sales Funnel,"""Embudo"" de ventas"
apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,La abreviatura es obligatoria
-DocType: Project,Task Progress,Grupo de Progreso
+DocType: Project,Task Progress,Progreso de Tarea
,Qty to Transfer,Cantidad a transferir
apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
@@ -3609,10 +3609,10 @@
DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
DocType: Products Settings,Products Settings,productos Ajustes
DocType: Account,Temporary,Temporal
-DocType: Program,Courses,cursos
+DocType: Program,Courses,Cursos
DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretaria
-DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivado, "en las palabras de campo no será visible en cualquier transacción"
+DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si se desactiva, el campo 'En Palabras' no será visible en ninguna transacción."
DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
DocType: Pricing Rule,Buying,Compras
DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por
@@ -3724,7 +3724,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +368,Note: {0},Nota: {0}
,Delivery Note Trends,Evolución de las notas de entrega
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumen de la semana.
-,In Stock Qty,En stock Cantidad
+,In Stock Qty,En Cantidad de Stock
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizada mediante transacciones de inventario
DocType: Student Group Creation Tool,Get Courses,Obtener Cursos
DocType: GL Entry,Party,Tercero
@@ -3770,7 +3770,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Activos {0} no puede ser desechada, como ya lo es {1}"
DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID del cliente
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marcos Ausente
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marcar Ausente
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}
DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
@@ -3832,7 +3832,7 @@
apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Batch or Course Schedule is mandatory,Lote estudiante o Horario del curso es obligatoria
DocType: Employee,Notice (days),Aviso (días)
DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2298,Select items to save the invoice,Seleccione artículos para ahorrar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2298,Select items to save the invoice,Seleccione artículos para guardar la factura
DocType: Employee,Encashment Date,Fecha de cobro
DocType: Training Event,Internet,Internet
DocType: Account,Stock Adjustment,Ajuste de existencias
@@ -3872,14 +3872,14 @@
DocType: Company,Distribution,Distribución
apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Total Pagado
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Gerente de proyectos
-,Quoted Item Comparison,Citado artículo Comparación
+,Quoted Item Comparison,Comparación de artículos de Cotización
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Despacho
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,El valor neto de activos como en
DocType: Account,Receivable,A cobrar
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +904,Select Items to Manufacture,Seleccionar artículos al Fabricación
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +904,Select Items to Manufacture,Seleccionar artículos para Fabricación
apps/erpnext/erpnext/accounts/page/pos/pos.js +909,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
DocType: Item,Material Issue,Expedición de material
DocType: Hub Settings,Seller Description,Descripción del vendedor
@@ -3910,7 +3910,7 @@
DocType: Employee Loan,Disbursement Date,Fecha de desembolso
DocType: Vehicle,Vehicle,Vehículo
DocType: Purchase Invoice,In Words,En palabras
-DocType: POS Profile,Item Groups,los grupos de artículos
+DocType: POS Profile,Item Groups,Grupos de productos
apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
DocType: Production Planning Tool,Material Request For Warehouse,Requisición de materiales para el almacén
DocType: Sales Order Item,For Production,Por producción
@@ -3928,7 +3928,7 @@
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Cantidad faltante
apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
DocType: Employee Loan,Repay from Salary,Pagar de su sueldo
-DocType: Leave Application,LAP/,REGAZO/
+DocType: Leave Application,LAP/,LAP/
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +334,Requesting payment against {0} {1} for amount {2},Solicitando el pago contra {0} {1} para la cantidad {2}
DocType: Salary Slip,Salary Slip,Nómina salarial
DocType: Lead,Lost Quotation,Presupuesto perdido
@@ -3949,7 +3949,7 @@
DocType: Account,Account,Cuenta
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
,Requested Items To Be Transferred,Artículos solicitados para ser transferidos
-DocType: Expense Claim,Vehicle Log,Iniciar vehículo
+DocType: Expense Claim,Vehicle Log,Bitácora del Vehiculo
apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Almacén {0} no está vinculada a ninguna cuenta, por favor crear / enlazar la cuenta correspondiente (Activo) para el almacén."
DocType: Purchase Invoice,Recurring Id,ID recurrente
DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
@@ -3995,7 +3995,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
DocType: Sales Invoice,Commission,Comisión
apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Hoja de tiempo para la fabricación.
-apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Total parcial
+apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
DocType: Salary Detail,Default Amount,Importe por defecto
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,El almacén no se encuentra en el sistema
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumen de este mes
@@ -4055,7 +4055,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque se ha hecho el Presupuesto"
apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formación de votos
-DocType: Vehicle Log,Make Expense Claim,Hacer de Gastos
+DocType: Vehicle Log,Make Expense Claim,Crear Gasto
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Por supuesto es obligatorio en la fila {0}
@@ -4102,7 +4102,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +287,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
DocType: Naming Series,Help HTML,Ayuda 'HTML'
DocType: Student Group Creation Tool,Student Group Creation Tool,Herramienta de creación de grupo de alumnos
-DocType: Item,Variant Based On,En variante basada
+DocType: Item,Variant Based On,Variante basada en
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Sus proveedores
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
@@ -4354,7 +4354,7 @@
DocType: Purchase Invoice,Total Advance,Total anticipo
apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La fecha final de duración no puede ser anterior a la fecha de inicio Plazo. Por favor, corrija las fechas y vuelve a intentarlo."
,BOM Stock Report,La lista de materiales de Informe
-DocType: Stock Reconciliation Item,Quantity Difference,Cantidad Diferencia
+DocType: Stock Reconciliation Item,Quantity Difference,Diferencia de Cantidad
apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Procesando nómina
DocType: Opportunity Item,Basic Rate,Precio base
DocType: GL Entry,Credit Amount,Importe acreditado
@@ -4410,7 +4410,7 @@
DocType: Guardian,Guardian,guardián
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
DocType: Employee,Education,Educación
-DocType: Selling Settings,Campaign Naming By,Ordenar campañas por
+DocType: Selling Settings,Campaign Naming By,Nombrar campañas por
DocType: Employee,Current Address Is,La dirección actual es
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Asientos en el diario de contabilidad.
@@ -4449,13 +4449,13 @@
DocType: Project,Gross Margin %,Margen bruto %
DocType: BOM,With Operations,Con operaciones
apps/erpnext/erpnext/accounts/party.py +250,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
-DocType: Asset,Is Existing Asset,Es existente de activos
+DocType: Asset,Is Existing Asset,Es Activo Existente
,Monthly Salary Register,Registar salario mensual
DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior
DocType: Student,Home Address,Direccion de casa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Activos transferencia
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transferir Activo
DocType: POS Profile,POS Profile,Perfil de POS
DocType: Training Event,Event Name,Nombre del evento
apps/erpnext/erpnext/config/schools.py +43,Admission,Admisión
@@ -4479,7 +4479,7 @@
DocType: Program,Program Name,Nombre del programa
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La cantidad real es obligatoria
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos estudiantiles creados.
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos de Estudiante Creado
DocType: Employee Loan,Loan Type,Tipo de préstamo
DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Tarjetas de credito
@@ -4488,7 +4488,7 @@
DocType: Purchase Invoice,Next Date,Siguiente fecha
DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
DocType: Sales Invoice Item,Drop Ship,Nave de la gota
-DocType: Training Event,Attendees,Los asistentes
+DocType: Training Event,Attendees,Asistentes
DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
DocType: Academic Term,Term End Date,Plazo Fecha de finalización
DocType: Hub Settings,Seller Name,Nombre de vendedor
@@ -4527,7 +4527,7 @@
DocType: Serial No,Delivery Details,Detalles de la entrega
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +484,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
DocType: Program,Program Code,Código de programa
-DocType: Terms and Conditions,Terms and Conditions Help,Términos y Condiciones Ayuda
+DocType: Terms and Conditions,Terms and Conditions Help,Ayuda de Términos y Condiciones
,Item-wise Purchase Register,Detalle de compras
DocType: Batch,Expiry Date,Fecha de caducidad
,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
@@ -4538,13 +4538,13 @@
DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Medio día)
DocType: Supplier,Credit Days,Días de crédito
-DocType: Student Batch Creation Tool,Make Student Batch,Hacer lotes Estudiante
+DocType: Student Batch Creation Tool,Make Student Batch,Hacer Lote de Estudiantes
DocType: Leave Type,Is Carry Forward,Es un traslado
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
apps/erpnext/erpnext/controllers/accounts_controller.py +562,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Fecha de contabilización debe ser la misma que la fecha de compra {1} de activos {2}
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, introduzca los pedidos de cliente en la tabla anterior"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,No Enviado a salarios resbalones
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,No Envió Salarios
,Stock Summary,Resumen de la
apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferir un activo de un almacén a otro
DocType: Vehicle,Petrol,Gasolina
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 5c202a4..9df26ba 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -818,7 +818,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +744,No Permission,Ei oikeuksia
DocType: Company,Default Bank Account,oletus pankkitili
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Päivitä varastotase' ei voida käyttää tuotteille, joita ei ole toimitettu {0} kautta"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Päivitä varasto' ei voida käyttää tuotteille, joita ei ole toimitettu {0} kautta"
DocType: Vehicle,Acquisition Date,Hankintapäivä
apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
@@ -1235,7 +1235,7 @@
DocType: GL Entry,Against Voucher,kuitin kohdistus
DocType: Item,Default Buying Cost Center,ostojen oletuskustannuspaikka
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Saadaksesi kaiken irti ERPNextistä, Suosittelemme katsomaan nämä ohjevideot."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,että
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,lle
DocType: Item,Lead Time in days,"virtausaika, päivinä"
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,maksettava tilien yhteenveto
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
@@ -1636,7 +1636,7 @@
DocType: Sales Invoice,Packed Items,Pakatut tuotteet
apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Takuuvaatimus sarjanumerolle
DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","korvaa BOM kaikissa muissa BOM:ssa, jossa sitä käytetään, korvaa vanhan BOM linkin, päivittää kustannukset ja muodostaa uuden ""BOM tuote räjäytyksen"" tilaston uutena BOM:na"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Kaikki yhteensä'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Yhteensä'
DocType: Shopping Cart Settings,Enable Shopping Cart,aktivoi ostoskori
DocType: Employee,Permanent Address,Pysyvä osoite
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,"Advance paid against {0} {1} cannot be greater \
@@ -2381,7 +2381,7 @@
DocType: Sales Order,Billing Status,Laskutus tila
apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoi asia
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Hyödykekulut
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-yli
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ja yli
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
DocType: Buying Settings,Default Buying Price List,"oletus hinnasto, osto"
DocType: Process Payroll,Salary Slip Based on Timesheet,Palkka tuntilomakkeen mukaan
@@ -2814,7 +2814,7 @@
DocType: Asset,Double Declining Balance,Double jäännösarvopoisto
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +170,Closed order cannot be cancelled. Unclose to cancel.,Suljettu järjestys ei voi peruuttaa. Unclose peruuttaa.
DocType: Student Guardian,Father,Isä
-apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,Päivitä Stock "ei voida tarkistaa käyttöomaisuushankintoihin myytävänä
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,'Päivitä varasto' ei voida valita käyttöomaisuuden myynteihin
DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
DocType: Attendance,On Leave,lomalla
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,hae päivitykset
@@ -3950,7 +3950,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Varastoa ei löydy järjestelmästä
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tämän kuun yhteenveto
DocType: Quality Inspection Reading,Quality Inspection Reading,Laarutarkistuksen luku
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Jäädytä varasto joka on vanhempi kuin % päivää
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Kylmävarasto pitäisi olla vähemmän kuin % päivää
DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
,Project wise Stock Tracking,"projekt työkalu, varastoseuranta"
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 96c00de..3f6779d 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -40,7 +40,7 @@
DocType: Vehicle,Natural Gas,Gaz naturel
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Compte Bancaire ne peut pas être nommé {0}
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Titres (ou groupes) sur lequel les entrées comptables sont faites et les soldes sont maintenus.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),Exceptionnelle pour {0} ne peut pas être inférieur à zéro ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),Solde pour {0} ne peut pas être inférieur à zéro ({1})
DocType: Manufacturing Settings,Default 10 mins,10 minutes Par Défaut
DocType: Leave Type,Leave Type Name,Nom du Type de Congé
apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Afficher ouverte
@@ -69,7 +69,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Référence:% s, Code de l'article:% s et le client:% s"
DocType: Item,Country of Origin,Pays d'origine
apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,En Stock
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Questions ouvertes
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Ouvrir les Questions
DocType: Production Plan Item,Production Plan Item,Article du plan de Fabrication
apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'employé {1}
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Soins de Santé
@@ -100,7 +100,7 @@
apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
DocType: Payment Request,Payment Request,Requête de paiement
DocType: Asset,Value After Depreciation,Valeur après amortissement
-DocType: Employee,O+,O +
+DocType: Employee,O+,O+
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,En Relation
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance date can not be less than employee's joining date,Date de présence ne peut pas être inférieure à la date se joindre à l'employé
DocType: Grading Scale,Grading Scale Name,Nom de l'Échelle de Notation
@@ -112,7 +112,7 @@
DocType: Packed Item,Parent Detail docname,DocName Détail Parent
apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
DocType: Student Log,Log,Journal
-apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d'un emploi.
+apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d'un Emploi.
DocType: Item Attribute,Increment,Incrément
apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Sélectionnez Entrepôt ...
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicité
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Ouverture
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Du {0} au {1}
DocType: Item,Copy From Item Group,Copier Depuis un Groupe d'Articles
-DocType: Journal Entry,Opening Entry,Entrée ouverture
+DocType: Journal Entry,Opening Entry,Écriture d'Ouverture
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Compte Bénéficiaire Seulement
DocType: Employee Loan,Repay Over Number of Periods,Rembourser Over Nombre de périodes
DocType: Stock Entry,Additional Costs,Frais Supplémentaires
@@ -244,7 +244,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'article {0}
DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la Liste des Prix (%)
DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valeur hors
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valeur Sortante
DocType: Production Planning Tool,Sales Orders,Commandes clients
DocType: Purchase Taxes and Charges,Valuation,Valorisation
,Purchase Order Trends,Tendances Bon de commande
@@ -293,7 +293,7 @@
apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Demande d'achat.
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ceci est basé sur les feuilles de temps créées contre ce projet
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +371,Net Pay cannot be less than 0,Salaire net ne peut pas être inférieur à 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Seul l'approbateur de congé sélectionné peut soumettre cette demande de congé
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Seul l'Approbateur de Congé sélectionné peut soumettre cette Demande de Congé
apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,La date de relève doit être postérieure à la date de l'adhésion
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Congés par Année
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ligne {0}: S'il vous plaît vérifier 'Est Avance' sur compte {1} si c'est une entrée avance.
@@ -358,7 +358,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +643,Supplier Invoice No exists in Purchase Invoice {0},No de Facture du Fournisseur existe dans Factures d'Achat {0}
apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gérer l'arborescence des vendeurs
DocType: Job Applicant,Cover Letter,Lettre de Motivation
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Chèques et Dépôts restant à compenser
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Chèques et Dépôts en suspens à compenser
DocType: Item,Synced With Hub,Synchronisé avec Hub
DocType: Vehicle,Fleet Manager,Gestionnaire de Flotte
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},# Ligne {0}: {1} ne peut pas être négatif pour l'élément {2}
@@ -464,7 +464,7 @@
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Moy. Taux de vente
DocType: Assessment Plan,Examiner Name,Nom de l'Examinateur
apps/erpnext/erpnext/utilities/transaction_base.py +148,Quantity cannot be a fraction in row {0},La quantité ne peut pas être une fraction à la ligne {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Prix
+DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Taux
DocType: Delivery Note,% Installed,Installé%
apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Les Salles de Classe / Laboratoires etc. où des conférences peuvent être programmées.
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,S'il vous plaît entrez en premier le nom de l'entreprise
@@ -479,7 +479,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,À but non lucratif
DocType: Production Order,Not Started,Pas commencé
DocType: Lead,Channel Partner,Partenaire de Canal
-DocType: Account,Old Parent,Parent Vieux
+DocType: Account,Old Parent,Grand Parent
DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui fera partie de cet Email. Chaque transaction a une introduction séparée.
apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
DocType: Accounts Settings,Accounts Frozen Upto,Comptes Gelés Jusqu'au
@@ -535,7 +535,7 @@
DocType: Employee,Emergency Phone,Téléphone d'Urgence
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acheter
,Serial No Warranty Expiry,Expiration de Garantie du N° de Série
-DocType: Sales Invoice,Offline POS Name,Hors ligne POS Nom
+DocType: Sales Invoice,Offline POS Name,Nom du PDV Hors-ligne`
DocType: Sales Order,To Deliver,A Livrer
DocType: Purchase Invoice Item,Item,Article
apps/erpnext/erpnext/accounts/page/pos/pos.js +2342,Serial no item cannot be a fraction,Un article avec un Numéro de série ne peut pas être une fraction
@@ -548,7 +548,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Abréviation déjà utilisée pour une autre société
DocType: Selling Settings,Default Customer Group,Groupe de Clients par Défaut
DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si coché, le champ ""Total arrondi"" ne sera pas visible et les montants ne seront pas arrondis."
-DocType: BOM,Operating Cost,Coût d'exploitation
+DocType: BOM,Operating Cost,Coût d'Exploitation
DocType: Sales Order Item,Gross Profit,Bénéfice Brut
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incrément ne peut pas être 0
DocType: Production Planning Tool,Material Requirement,Exigence Matériel
@@ -605,7 +605,7 @@
apps/erpnext/erpnext/config/selling.py +28,Customer database.,Base de données Clients.
DocType: Quotation,Quotation To,Devis Pour
DocType: Lead,Middle Income,Revenu intermédiaire
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +217,Opening (Cr),Ouverture ( Cr )
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +217,Opening (Cr),Ouverture (Cr)
apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
apps/erpnext/erpnext/accounts/utils.py +353,Allocated amount can not be negative,Le montant alloué ne peut être négatif
DocType: Purchase Order Item,Billed Amt,Mnt Facturé
@@ -633,7 +633,7 @@
DocType: Batch,Batch Description,Description du Lot
apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Paiement Gateway Account ne crée pas, s'il vous plaît créer un manuellement."
DocType: Sales Invoice,Sales Taxes and Charges,Taxes et frais de vente
-DocType: Employee,Organization Profile,Profil de l'organisme
+DocType: Employee,Organization Profile,Profil de l'Organisation
DocType: Student,Sibling Details,Détails Sibling
DocType: Vehicle Service,Vehicle Service,Entretien des véhicules
apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Déclencher automatiquement la demande de retour d'expérience en fonction des conditions.
@@ -694,7 +694,7 @@
DocType: Employee Loan,Total Interest Payable,Total des intérêts à payer
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et Frais du Coût au Débarquement
DocType: Production Order Operation,Actual Start Time,Heure de Début Réelle
-DocType: BOM Operation,Operation Time,Temps de fonctionnement
+DocType: BOM Operation,Operation Time,Heure de l'Opération
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +134,Finish,Terminer
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
DocType: Timesheet,Total Billed Hours,Total des heures facturées
@@ -711,10 +711,10 @@
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Pour signaler un problème, passez à"
DocType: Interest,Interest,Intérêt
apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prévente
-DocType: Purchase Receipt,Other Details,Autres détails
+DocType: Purchase Receipt,Other Details,Autres Détails
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
DocType: Account,Accounts,Comptes
-DocType: Vehicle,Odometer Value (Last),Valeur compteur kilométrique (dernier)
+DocType: Vehicle,Odometer Value (Last),Valeur Compteur Kilométrique (Dernier)
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Paiement entrée est déjà créé
DocType: Purchase Receipt Item Supplied,Current Stock,Stock Actuel
@@ -725,15 +725,15 @@
DocType: Hub Settings,Seller City,Ville du vendeur
,Absent Student Report,Rapport des Absences
DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
-DocType: Offer Letter Term,Offer Letter Term,Terme lettre de proposition
+DocType: Offer Letter Term,Offer Letter Term,Terme de la Lettre de Proposition
apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item has variants.,L'article a des variantes.
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
DocType: Bin,Stock Value,Valeur du Stock
apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Société {0} n'existe pas
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Qté consommée par unité
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Qté Consommée Par Unité
DocType: Serial No,Warranty Expiry Date,Date d'expiration de la garantie
-DocType: Material Request Item,Quantity and Warehouse,Quantité et entrepôt
+DocType: Material Request Item,Quantity and Warehouse,Quantité et Entrepôt
DocType: Sales Invoice,Commission Rate (%),Taux de Commission (%)
DocType: Project,Estimated Cost,Coût Estimé
DocType: Purchase Order,Link to material requests,Lien vers les demandes matérielles
@@ -764,7 +764,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +140,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Réservé pour la fabrication
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Énergie
-DocType: Opportunity,Opportunity From,De opportunité
+DocType: Opportunity,Opportunity From,Opportunité De
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de salaire mensuel.
DocType: BOM,Website Specifications,Site Web Spécifications
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Du {0} de type {1}
@@ -826,7 +826,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +128,Asset scrapped via Journal Entry {0},Actif mis au rebut via Écriture de Journal {0}
DocType: Employee Loan,Interest Income Account,Compte de revenu d'intérêt
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Entretient et dépense bureau
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Dépenses d'Entretien du Bureau
apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurer un compte de messagerie
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,S'il vous plaît entrer l'article en premier
DocType: Account,Liability,Responsabilité
@@ -862,7 +862,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} est déjà terminée ou annulée
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Aucune tâche
DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera généré par exemple 05, 28 etc"
-DocType: Asset,Opening Accumulated Depreciation,Ouverture Amortissement cumulé
+DocType: Asset,Opening Accumulated Depreciation,Amortissement Cumulé d'Ouverture
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5
DocType: Program Enrollment Tool,Program Enrollment Tool,Outil du programme d'inscription
apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Enregistrements Formulaire-C
@@ -914,20 +914,20 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total des frais applicables en Achat Table des reçus Les articles doivent être le même que Total des taxes et frais
DocType: Sales Team,Incentives,Incitations
DocType: SMS Log,Requested Numbers,Numéros demandés
-DocType: Production Planning Tool,Only Obtain Raw Materials,Seulement obtenir des matières premières
+DocType: Production Planning Tool,Only Obtain Raw Materials,Obtenir seulement des Matières Premières
apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,L'évaluation des performances.
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Activation de 'Utiliser pour Panier', comme le Panier est activé et qu'il devrait y avoir au moins une Règle de Taxes pour le Panier"
apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Paiement entrée {0} est lié contre l'ordonnance {1}, vérifier si elle doit être tirée en avance dans la présente facture."
DocType: Sales Invoice Item,Stock Details,Détails du Stock
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet
apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-de-vente
-DocType: Vehicle Log,Odometer Reading,Relevé du compteur kilométrique
+DocType: Vehicle Log,Odometer Reading,Relevé du Compteur Kilométrique
apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà Créditeur, vous n'êtes pas autorisé à mettre en 'Solde Doit Être' comme 'Débiteur'"
DocType: Account,Balance must be,Solde doit être
DocType: Hub Settings,Publish Pricing,Publier la Tarification
DocType: Notification Control,Expense Claim Rejected Message,Message de Note de Frais Rejetée
,Available Qty,Qté Disponible
-DocType: Purchase Taxes and Charges,On Previous Row Total,Le total de la rangée précédente
+DocType: Purchase Taxes and Charges,On Previous Row Total,Le Total de la Rangée Précédente
DocType: Purchase Invoice Item,Rejected Qty,Qté rejeté
DocType: Salary Slip,Working Days,Jours ouvrables
DocType: Serial No,Incoming Rate,Taux d'entrée
@@ -980,7 +980,7 @@
DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Le compte par défaut de Banque / Caisse sera automatiquement mis à jour dans la Facture PDV lorsque ce mode est sélectionné.
DocType: Lead,LEAD-,LEAD-
DocType: Employee,Permanent Address Is,Adresse permanente est
-DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis?
+DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis ?
apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,La Marque
DocType: Employee,Exit Interview Details,Entretient de Départ
DocType: Item,Is Purchase Item,Est-Item
@@ -988,7 +988,7 @@
DocType: Stock Ledger Entry,Voucher Detail No,Détail du bon No
apps/erpnext/erpnext/accounts/page/pos/pos.js +709,New Sales Invoice,Nouvelle Facture de Vente
DocType: Stock Entry,Total Outgoing Value,Valeur totale sortante
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Date d'ouverture et date de clôture devraient être dans le même exercice
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Date d'Ouverture et Date de Clôture devraient être dans le même Exercice
DocType: Lead,Request for Information,Demande de renseignements
apps/erpnext/erpnext/accounts/page/pos/pos.js +723,Sync Offline Invoices,Synchronisation Factures hors connexion
DocType: Payment Request,Paid,Payé
@@ -1046,7 +1046,7 @@
apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mon panier
apps/erpnext/erpnext/controllers/selling_controller.py +159,Order Type must be one of {0},Type de Commande doit être l'un des {0}
DocType: Lead,Next Contact Date,Date du prochain contact
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'ouverture
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'Ouverture
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,S'il vous plaît entrez compte pour le changement Montant
DocType: Student Batch,Student Batch Name,Student Batch Nom
DocType: Holiday List,Holiday List Name,Nom de la Liste de Vacances
@@ -1094,7 +1094,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Entrepôt
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe
apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutement
-DocType: Lead,Organization Name,Nom de l'organisation
+DocType: Lead,Organization Name,Nom de l'Organisation
DocType: Tax Rule,Shipping State,Etat de livraison
,Projected Quantity as Source,Quantité projetée comme Source
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de reçus d'achat'
@@ -1112,14 +1112,14 @@
DocType: Packing Slip,Net Weight UOM,Unité de mesure Poids Net
apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Résultats
DocType: Item,Default Supplier,Fournisseur par Défaut
-DocType: Manufacturing Settings,Over Production Allowance Percentage,Surproduction Allocation Pourcentage
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Pourcentage d'Allocation en cas de Surproduction
DocType: Employee Loan,Repayment Schedule,Échéancier de remboursement
DocType: Shipping Rule Condition,Shipping Rule Condition,Condition règle de livraison
DocType: Holiday List,Get Weekly Off Dates,Obtenir les Dates de Congés
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,La date de Fin ne peut pas être antérieure à la Date de Début
DocType: Sales Person,Select company name first.,Sélectionnez en premier le nom de la société.
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des fournisseurs.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des Fournisseurs.
apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},A {0} | {1} {2}
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Âge Moyen
DocType: Opportunity,Your sales person who will contact the customer in future,Votre commercial prendra contact avec le client ultérieurement
@@ -1131,7 +1131,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
DocType: Journal Entry,Make Difference Entry,Calculer l'entrée par différence
DocType: Upload Attendance,Attendance From Date,Présence Depuis
-DocType: Appraisal Template Goal,Key Performance Area,Domaine essentiel de performance
+DocType: Appraisal Template Goal,Key Performance Area,Domaine Essentiel de Performance
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transport
apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Attribut invalide
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} doit être soumis
@@ -1146,7 +1146,7 @@
DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Règles de Livraison du Panier
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,L'ordre de Fabrication {0} doit être cancellé avant de canceller cette Commande Client
apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',S'il vous plaît mettre «Appliquer réduction supplémentaire sur '
-,Ordered Items To Be Billed,Articles commandés à facturer
+,Ordered Items To Be Billed,Articles Commandés À Facturer
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,La Plage Initiale doit être inférieure à la Plage Finale
DocType: Global Defaults,Global Defaults,Valeurs par Défaut Globales
apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,Invitation de collaboration de projet
@@ -1160,7 +1160,7 @@
DocType: Lead,Consultant,Consultant
DocType: Salary Slip,Earnings,Bénéfices
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Le Produit Fini {0} doit être saisi pour une écriture de type de Fabrication
-apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Solde d'ouverture de comptabilité
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Solde d'Ouverture de Comptabilité
DocType: Sales Invoice Advance,Sales Invoice Advance,Avance facture de vente
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Pas de requête à demander
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un autre enregistrement de Budget '{0}' existe déjà pour {1} '{2}' pour l'exercice {3}
@@ -1240,10 +1240,10 @@
DocType: Purchase Invoice,Is Recurring,Est récurrent
DocType: Purchase Invoice,Supplied Items,Articles fournis
DocType: Student,STUD.,GOUJON.
-DocType: Production Order,Qty To Manufacture,Quantité à fabriquer
+DocType: Production Order,Qty To Manufacture,Quantité À Fabriquer
DocType: Email Digest,New Income,Nouveau revenu
DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le même taux tout au long du cycle d'achat
-DocType: Opportunity Item,Opportunity Item,Article occasion
+DocType: Opportunity Item,Opportunity Item,Article de l'Opportunité
,Student and Guardian Contact Details,Étudiant et Guardian Détails de contact
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Pour le fournisseur {0} Adresse e-mail est nécessaire pour envoyer des e-mail
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Ouverture temporaire
@@ -1357,7 +1357,7 @@
DocType: Purchase Invoice,Party Account Currency,Compte Parti devise
,BOM Browser,Explorateur LDM
DocType: Purchase Taxes and Charges,Add or Deduct,Ajouter ou Déduire
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,condition qui se coincide touvée
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Conditions qui coincident touvées entre :
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,L'Écriture de Journal {0} est déjà ajustée par un autre bon
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ordre Valeur totale
apps/erpnext/erpnext/demo/setup/setup_data.py +315,Food,Alimentation
@@ -1369,7 +1369,7 @@
apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somme des points pour tous les objectifs devraient être 100. Il est {0}
DocType: Project,Start and End Dates,Dates début et fin
,Delivered Items To Be Billed,Articles Livrés à Facturer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Ouvrir BOM {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Ouvrir LDM {0}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Entrepôt ne peut être modifié pour le numéro de série
DocType: Authorization Rule,Average Discount,Remise Moyenne
DocType: Purchase Invoice Item,UOM,UOM
@@ -1382,7 +1382,7 @@
DocType: Activity Cost,Projects,Projets
DocType: Payment Request,Transaction Currency,Devise de la transaction
apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Du {0} | {1} {2}
-DocType: Production Order Operation,Operation Description,Description de l'opération
+DocType: Production Order Operation,Operation Description,Description de l'Opération
DocType: Item,Will also apply to variants,Se appliquera également aux variantes
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré.
DocType: Quotation,Shopping Cart,Panier
@@ -1461,7 +1461,7 @@
DocType: Asset Movement,Stock Manager,Responsable des Stocks
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Entrepôt Source est obligatoire à la ligne {0}
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Bordereau de livraison
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Loyer du bureau
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Loyer du Bureau
apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importation a échoué!
apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Aucune adresse encore ajouté.
@@ -1469,7 +1469,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analyste
DocType: Item,Inventory,Inventaire
DocType: Item,Sales Details,Détails ventes
-DocType: Quality Inspection,QI-,Qi-
+DocType: Quality Inspection,QI-,QI-
DocType: Opportunity,With Items,Avec Articles
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Qté
DocType: Notification Control,Expense Claim Rejected,Note de Frais Rejetée
@@ -1493,7 +1493,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Date de Début de l'Exercice Financier
DocType: POS Profile,Apply Discount,Appliquer Réduction
DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Projets Ouverts
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Ouvrir les Projets
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +267,Packing Slip(s) cancelled,Bordereau(x) annulé
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Flux de Trésorerie des Investissements
DocType: Program Course,Program Course,Cours du programme
@@ -1553,7 +1553,7 @@
,Lead Name,Nom du Prospect
,POS,Points de Ventes
DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Ouverture Stock Solde
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Solde d'Ouverture des Stocks
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} doit apparaître qu'une seule fois
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus que {0} {1} contre Purchase Order {2}
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Congés Attribués avec Succès pour {0}
@@ -1578,7 +1578,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Paiement E-mail
apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nouvelle tâche
apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Faire soumission
-apps/erpnext/erpnext/config/selling.py +216,Other Reports,Autres rapports
+apps/erpnext/erpnext/config/selling.py +216,Other Reports,Autres Rapports
DocType: Dependent Task,Dependent Task,Tâche Dépendante
apps/erpnext/erpnext/stock/doctype/item/item.py +406,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Les Congés de type {0} ne peuvent pas être plus long que {1}
@@ -1597,7 +1597,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +246,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Précédent Année financière est pas fermé
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Âge (Jours)
-DocType: Quotation Item,Quotation Item,Article de la soumission
+DocType: Quotation Item,Quotation Item,Article du Devis
DocType: Account,Account Name,Nom du Compte
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,La Date Initiale ne peut pas être postérieure à la Date Finale
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,N ° de série {0} quantité {1} ne peut pas être une fraction
@@ -1670,7 +1670,7 @@
DocType: Payment Entry,Paid Amount (Company Currency),Montant payé (Devise Société)
DocType: Purchase Invoice,Additional Discount,Remise Supplémentaire
DocType: Selling Settings,Selling Settings,Réglages de vente
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Enchères en ligne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Enchères en Ligne
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,S'il vous plaît spécifier Quantité ou l'évaluation des taux ou à la fois
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,Accomplissement
apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Voir Panier
@@ -1704,14 +1704,14 @@
DocType: Employee,AB+,AB+
DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a des variantes, alors il ne peut pas être sélectionné dans les commandes, etc."
DocType: Lead,Next Contact By,Contact suivant par
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantité requise pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantité requise pour l'Article {0} à la ligne {1}
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'article {1}
-DocType: Quotation,Order Type,Type d'ordre
+DocType: Quotation,Order Type,Type de Commande
DocType: Purchase Invoice,Notification Email Address,Adresse E-mail de notification
,Item-wise Sales Register,Registre des ventes par Article
DocType: Asset,Gross Purchase Amount,Montant d'Achat Brut
DocType: Asset,Depreciation Method,Méthode d'Amortissement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +686,Offline,Hors ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,Offline,Hors Ligne
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Est-ce Taxes incluses dans le taux de base?
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Cible total
DocType: Program Course,Required,Obligatoire
@@ -1730,7 +1730,7 @@
DocType: Employee Attendance Tool,Employees HTML,Employés HTML
apps/erpnext/erpnext/stock/doctype/item/item.py +420,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
DocType: Employee,Leave Encashed?,Laisser Encaissé ?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunité champ est obligatoire
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Le champ Opportunité De est obligatoire
DocType: Email Digest,Annual Expenses,Dépenses Annuelles
DocType: Item,Variants,Variantes
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Make Purchase Order,Faire un bon de commande
@@ -1794,7 +1794,7 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,télécommunications
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Effectuer une entrée de paiement
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieur à {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieure à {1}
,Sales Invoice Trends,Tendances des Factures de Vente
DocType: Leave Application,Apply / Approve Leaves,Appliquer / Approuver les Congés
apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pour
@@ -1845,7 +1845,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} créé
DocType: Delivery Note Item,Against Sales Order,Pour la Commande Client
,Serial No Status,Statut du No de série
-DocType: Payment Entry Reference,Outstanding,Exceptionnel
+DocType: Payment Entry Reference,Outstanding,Solde
,Daily Timesheet Summary,Récapitulatif Quotidien des Feuilles de Présence
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
must be greater than or equal to {2}","Row {0}: Pour régler {1} périodicité, différence entre partir et à ce jour \
@@ -1869,7 +1869,7 @@
,Item-wise Purchase History,Historique des achats (par Article)
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquez sur "" Générer Calendrier ' pour récupérer le série n ° ajouté pour l'article {0}"
DocType: Account,Frozen,Gelé
-,Open Production Orders,Commandes de Production Ouvertes
+,Open Production Orders,Ouvrir les Ordres de Fabrication
DocType: Sales Invoice Payment,Base Amount (Company Currency),Montant de Base (Devise de la Société)
DocType: Payment Reconciliation Payment,Reference Row,Rangée de référence
DocType: Installation Note,Installation Time,Temps d'installation
@@ -1887,7 +1887,7 @@
DocType: Employee Loan Application,Total Payable Amount,Montant total à payer
DocType: Task,Expected Time (in hours),Durée Prévue (en heures)
DocType: Item Reorder,Check in (group),Enregistrement (groupe)
-,Qty to Order,Quantité à commander
+,Qty to Order,Quantité à Commander
DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Le compte tête sous la responsabilité ou l'équité, dans lequel Profit / perte sera comptabilisée"
apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagramme de Gantt de toutes les tâches.
DocType: Opportunity,Mins to First Response,Minutes avant la Première Réponse
@@ -1926,7 +1926,7 @@
,Maintenance Schedules,Programmes d'entretien
DocType: Task,Actual End Date (via Time Sheet),Date de Fin Réelle (via la Feuille de Temps)
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
-,Quotation Trends,Tendances de Soumission
+,Quotation Trends,Tendances des Devis
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,Item Group not mentioned in item master for item {0},Le groupe d'articles n'est pas mentionnés dans la fiche de l'article pour l'article {0}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
@@ -2011,10 +2011,10 @@
DocType: Purchase Taxes and Charges,Deduct,Déduire
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Description de l'Emploi
DocType: Student Applicant,Applied,Appliqué
-DocType: Sales Invoice Item,Qty as per Stock UOM,Qté en stock pour Emballage
+DocType: Sales Invoice Item,Qty as per Stock UOM,Qté par UDM du Stock
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Guardian2 Name,Nom Guardian2
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" pas autorisés à nommer série"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace des prospections, devis, vente etc. Pour mesurer le retour sur investissement."
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une Trace des Campagnes de Vente. Garder une trace des Prospects, Devis, Commandes Client etc. depuis les Campagnes pour mesurer le Retour sur Investissement."
DocType: Expense Claim,Approver,Approbateur
,SO Qty,SO Quantité
DocType: Guardian,Work Address,Adresse de travail
@@ -2050,7 +2050,7 @@
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Coût du Nouvel Achat
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Commande client requise pour l'article {0}
DocType: Purchase Invoice Item,Rate (Company Currency),Prix (Monnaie de la société)
-DocType: Student Guardian,Others,autres
+DocType: Student Guardian,Others,Autres
DocType: Payment Entry,Unallocated Amount,Montant Unallocated
apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Impossible de trouver un article similaire. Veuillez sélectionner une autre valeur pour {0}.
DocType: POS Profile,Taxes and Charges,Impôts et taxes
@@ -2063,7 +2063,7 @@
DocType: Vehicle Service,Service Item,service de l'article
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquez sur "" Générer Calendrier » pour obtenir le calendrier"
apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Il y avait des erreurs lors de la suppression des horaires suivants:
-DocType: Bin,Ordered Quantity,Quantité commandée
+DocType: Bin,Ordered Quantity,Quantité Commandée
apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","e.g. ""Construire des outils pour les constructeurs"""
DocType: Grading Scale,Grading Scale Intervals,Intervalles de l'Échelle de Notation
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite en devise: {3}
@@ -2090,7 +2090,7 @@
DocType: Production Order Operation,Pending,En attente
DocType: Course,Course Name,Nom du Cours
DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Les utilisateurs qui peuvent approuver les demandes de congé d'un employé en particulier
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Équipement de bureau
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Équipements de Bureau
DocType: Purchase Invoice Item,Qty,Qté
DocType: Fiscal Year,Companies,Sociétés
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Électronique
@@ -2108,7 +2108,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Compte de Débit Requis
apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aider à suivre le temps, le coût et la facturation des activités effectuées par votre équipe"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste prix d'achat
-DocType: Offer Letter Term,Offer Term,Offre à terme
+DocType: Offer Letter Term,Offer Term,Terme de la Proposition
DocType: Quality Inspection,Quality Manager,Responsable Qualité
DocType: Job Applicant,Job Opening,Offre d’Emploi
DocType: Payment Reconciliation,Payment Reconciliation,Rapprochement des paiements
@@ -2116,7 +2116,7 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total non rémunéré: {0}
DocType: BOM Website Operation,BOM Website Operation,Opération de LDM du Site Internet
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,lettre de proposition
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Lettre de Proposition
apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Générer des Demandes de Matériel (MRP) et des Ordres de Fabrication.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total facturé Amt
DocType: BOM,Conversion Rate,Taux de Conversion
@@ -2225,7 +2225,7 @@
DocType: Process Payroll,Create Salary Slip,Créer une Fiche de Paie
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traçabilité
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Source des fonds ( Passif )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantité alignée {0} ({1}) doit être égale a la quantité fabriquée {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantité à la ligne {0} ({1}) doit être égale a la quantité fabriquée {2}
DocType: Appraisal,Employee,Employé
apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,S'il vous plaît définir note pour 0% treshold
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,{0} {1} is fully billed,{0} {1} est entièrement facturé
@@ -2273,7 +2273,7 @@
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'utilisateur
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Entrée rapide dans le journal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Écriture Rapide dans le Journal
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Groupe étudiant existe avec le même nom
DocType: Employee,Previous Work Experience,L'expérience de travail antérieure
@@ -2301,7 +2301,7 @@
apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unité de mesure
DocType: Fiscal Year,Year End Date,Date de Fin de l'exercice
DocType: Task Depends On,Task Depends On,Tâches dépendent de
-DocType: Supplier Quotation,Opportunity,Occasion
+DocType: Supplier Quotation,Opportunity,Opportunité
,Completed Production Orders,Ordres de Fabrication Terminés
DocType: Operation,Default Workstation,Station de Travail par Défaut
DocType: Notification Control,Expense Claim Approved Message,Message d'une Note de Frais Approuvée
@@ -2316,7 +2316,7 @@
DocType: Project,% Complete Method,% Méthode complète
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Entretien date de début ne peut pas être avant la date de livraison pour série n ° {0}
DocType: Production Order,Actual End Date,Date de Fin Réelle
-DocType: BOM,Operating Cost (Company Currency),Coût d'exploitation (Société Monnaie)
+DocType: BOM,Operating Cost (Company Currency),Coût d'Exploitation (Devise Société)
DocType: Purchase Invoice,PINV-,PINV-
DocType: Authorization Rule,Applicable To (Role),Applicable À (Rôle)
DocType: Stock Entry,Purpose,But
@@ -2418,7 +2418,7 @@
DocType: Purchase Invoice,Is Paid,Est payé
DocType: Salary Structure,Total Earning,Total Revenus
DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçus
-DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
+DocType: Stock Ledger Entry,Outgoing Rate,Taux Sortant
apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation principale des branches.
apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ou
DocType: Sales Order,Billing Status,Statut de la Facturation
@@ -2438,7 +2438,7 @@
DocType: Purchase Invoice,Total Taxes and Charges,Total Taxes et frais
DocType: Employee,Emergency Contact,Contact en cas d'Urgence
DocType: Bank Reconciliation Detail,Payment Entry,Paiement Entrée
-DocType: Item,Quality Parameters,Paramètres de qualité
+DocType: Item,Quality Parameters,Paramètres de Qualité
,sales-browser,Navigateur de ventes
apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Grand Livre
DocType: Target Detail,Target Amount,Montant Ciblé
@@ -2474,7 +2474,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Livraison
DocType: Stock Reconciliation Item,Current Qty,Qté Actuelle
DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Voir «Taux de matériaux à base de« coûts dans la section
-DocType: Appraisal Goal,Key Responsibility Area,Domaine à responsabilités principal
+DocType: Appraisal Goal,Key Responsibility Area,Domaine de Responsabilités Principal
apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Batchs étudiants vous aider à suivre la fréquentation, les évaluations et les frais pour les étudiants"
DocType: Payment Entry,Total Allocated Amount,Montant total alloué
DocType: Item Reorder,Material Request Type,Type de demande de matériel
@@ -2560,7 +2560,7 @@
,S.O. No.,S.O. Non.
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Merci de créer un Client à partir du Prospect {0}
DocType: Price List,Applicable for Countries,Applicable pour les Pays
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Seulement demandes d'autorisation avec le statut « approuvé » et « Rejeté » peut être soumis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Seules les Demandes de Congés avec le statut 'Appouvée' ou 'Rejetée' peuvent être soumises
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},Étudiant Nom de groupe est obligatoire dans la ligne {0}
DocType: Homepage,Products to be shown on website homepage,Produits destinés à être affichés sur le site Web page d'accueil
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Il s'agit d'un groupe de clients de la racine et ne peut être modifié .
@@ -2622,10 +2622,10 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Les frais seront distribués proportionnellement à la qté ou au montant de l'article, selon votre sélection"
DocType: Maintenance Visit,Purposes,Buts
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Au moins un article doit être saisi avec quantité négative dans le document de retour
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longtemps que les heures de travail disponibles dans poste de travail {1}, briser l'opération en plusieurs opérations"
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longue que toute heure de travail disponible dans le poste {1}, séparer l'opération en plusieurs opérations"
,Requested,demandé
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,Pas de remarques
-DocType: Purchase Invoice,Overdue,En retard
+DocType: Purchase Invoice,Overdue,En Retard
DocType: Account,Stock Received But Not Billed,Stock reçus mais non facturés
apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Compte racine doit être un groupe
DocType: Fees,FEE.,HONORAIRES.
@@ -2633,7 +2633,7 @@
DocType: Item,Total Projected Qty,Nombre total prévu
DocType: Monthly Distribution,Distribution Name,Nom de Distribution
DocType: Course,Course Code,Code de Cours
-apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspection de la Qualité requise pour l'Article {0}
DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taux à laquelle la devise du client est converti en devise de base de la société
DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux Net (Devise Société)
DocType: Salary Detail,Condition and Formula Help,Aide Condition et Formule
@@ -2734,7 +2734,7 @@
DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
DocType: Asset Category Account,Depreciation Expense Account,Compte de Dotations aux Amortissement
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Période De Probation
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisées dans une transaction
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisés dans une transaction
DocType: Expense Claim,Expense Approver,Approbateur des Frais
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +124,Row {0}: Advance against Customer must be credit,Row {0}: Advance contre le Client doit être crédit
apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Groupe à groupe
@@ -2825,9 +2825,9 @@
DocType: Asset,Expected Value After Useful Life,Valeur Attendue Après Utilisation Complète
DocType: Item,Reorder level based on Warehouse,Niveau de réapprovisionnement basée sur Entrepôt
DocType: Activity Cost,Billing Rate,Taux de Facturation
-,Qty to Deliver,Quantité à livrer
+,Qty to Deliver,Quantité à Livrer
,Stock Analytics,Analytics stock
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,Operations cannot be left blank,Les opérations peuvent ne pas être laissées vides
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,Operations cannot be left blank,Les opérations ne peuvent pas être laissées vides
DocType: Maintenance Visit Purpose,Against Document Detail No,Pour le Détail du Document N°
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Type de partie est obligatoire
DocType: Quality Inspection,Outgoing,Sortant
@@ -2871,7 +2871,7 @@
DocType: Student Guardian,Father,Père
apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,«Mise à jour du stock» ne peut être vérifié pour la vente d'actifs immobilisés
DocType: Bank Reconciliation,Bank Reconciliation,Réconciliation Bancaire
-DocType: Attendance,On Leave,En congé
+DocType: Attendance,On Leave,En Congé
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir les Mises à jour
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: compte {2} ne fait pas partie de la société {3}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
@@ -2891,7 +2891,7 @@
,Stock Projected Qty,Quantité Stock projeté
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Présence marquée HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Les citations sont des propositions, les offres que vous avez envoyé à vos clients"
+apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
DocType: Sales Order,Customer's Purchase Order,N° de Bon de Commande du Client
apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N ° de série et lot
DocType: Warranty Claim,From Company,De la Société
@@ -2901,7 +2901,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Les Commandes de Fabrications ne peuvent pas être élevés pour:
apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
DocType: Purchase Invoice,Purchase Taxes and Charges,Taxes et frais pour achats
-,Qty to Receive,Quantité à recevoir
+,Qty to Receive,Quantité à Recevoir
DocType: Leave Block List,Leave Block List Allowed,Liste de Blocage des Congés Autorisée
DocType: Grading Scale Interval,Grading Scale Interval,Intervalle de l'Échelle de Notation
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Note de Frais pour Indémnité Kilométrique {0}
@@ -2911,7 +2911,7 @@
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tous les Types de Fournisseurs
DocType: Global Defaults,Disable In Words,"Désactiver ""En Lettres"""
apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Le code de l'article est obligatoire car l'article n'est pas numéroté automatiquement
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},La soumission {0} n'est pas du type {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Le devis {0} n'est pas du type {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article calendrier d'entretien
DocType: Sales Order,% Delivered,Livré%
DocType: Production Order,PRO-,PRO-
@@ -2922,7 +2922,7 @@
DocType: Purchase Invoice,Edit Posting Date and Time,Modifier l'affichage Date et heure
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},S'il vous plaît mettre amortissement Comptes liés à Asset Catégorie {0} ou {1} Société
DocType: Academic Term,Academic Year,Année Académique
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Ouverture équité en matière d'équilibre
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Ouverture de la Balance des Capitaux Propres
DocType: Lead,CRM,CRM
DocType: Appraisal,Appraisal,Estimation
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email envoyé au fournisseur {0}
@@ -2995,9 +2995,9 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projeté
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No de série {0} ne fait pas partie de l’entrepôt {1}
apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
-DocType: Notification Control,Quotation Message,Message du devis
+DocType: Notification Control,Quotation Message,Message du Devis
DocType: Employee Loan,Employee Loan Application,Demande de Prêt d'un Employé
-DocType: Issue,Opening Date,Date d'ouverture
+DocType: Issue,Opening Date,Date d'Ouverture
apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,La présence a été marquée avec succès.
DocType: Journal Entry,Remark,Remarque
DocType: Purchase Receipt Item,Rate and Amount,Taux et le montant
@@ -3022,7 +3022,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sous-traitant
DocType: Journal Entry Account,Journal Entry Account,Compte d’Écriture de Journal
apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Groupe étudiant
-DocType: Shopping Cart Settings,Quotation Series,Série soumission
+DocType: Shopping Cart Settings,Quotation Series,Séries de Devis
apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), veuillez changer le nom du groupe d'article ou renommer l'article"
apps/erpnext/erpnext/accounts/page/pos/pos.js +1868,Please select customer,S'il vous plaît sélectionner client
DocType: C-Form,I,I
@@ -3136,7 +3136,7 @@
apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offres d'Emploi Actuelles
DocType: Company,Stock Adjustment Account,Compte d'ajustement de stock
DocType: Journal Entry,Write Off,Effacer
-DocType: Timesheet Detail,Operation ID,ID. de l'opération
+DocType: Timesheet Detail,Operation ID,ID de l'Opération
DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","L'utilisateur du système (login) ID. S'il est défini, il sera par défaut pour toutes les formes de ressources humaines."
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
DocType: Task,depends_on,Dépend de
@@ -3174,7 +3174,7 @@
DocType: Training Event,Seminar,Séminaire
DocType: Program Enrollment Fee,Program Enrollment Fee,Programme Frais d'inscription
DocType: Item,Supplier Items,Fournisseur Articles
-DocType: Opportunity,Opportunity Type,Type d'opportunité
+DocType: Opportunity,Opportunity Type,Type d'Opportunité
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nouvelle Société
apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions ne peuvent être supprimés que par le créateur de la Société
apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nombre incorrect de General Ledger Entrées trouvées. Vous avez peut-être choisi le bon compte dans la transaction.
@@ -3247,8 +3247,8 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Compagnie Aérienne
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Problème matériel
DocType: Material Request Item,For Warehouse,Pour l’Entrepôt
-DocType: Employee,Offer Date,Date de l'offre
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Soumissions
+DocType: Employee,Offer Date,Date de la Proposition
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Devis
apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous avez réseau.
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Aucun groupe d'étudiants créés.
DocType: Purchase Invoice Item,Serial No,N ° de série
@@ -3273,7 +3273,7 @@
apps/erpnext/erpnext/config/selling.py +23,Customers,Clients
DocType: Student Sibling,Institution,Institution
DocType: Asset,Partially Depreciated,Partiellement dépréciées
-DocType: Issue,Opening Time,Horaire d'ouverture
+DocType: Issue,Opening Time,Horaire d'Ouverture
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Les date Du et Au sont requises
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
apps/erpnext/erpnext/stock/doctype/item/item.py +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
@@ -3306,7 +3306,7 @@
apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Soit la qté cible soit le montant cible est obligatoire
apps/erpnext/erpnext/stock/get_item_details.py +501,No default BOM exists for Item {0},Pas de nomenclature par défaut existe pour l'article {0}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,S'il vous plaît sélectionnez Date de publication abord
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d'ouverture devrait être avant la date de clôture
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d'Ouverture devrait être antérieure à la Date de Clôture
DocType: Leave Control Panel,Carry Forward,Reporter
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en grand livre
DocType: Department,Days for which Holidays are blocked for this department.,Jours pour lesquels les Vacances sont bloquées pour ce département.
@@ -3361,7 +3361,7 @@
DocType: Job Opening,Job Title,Titre de l'Emploi
apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Créer des Utilisateurs
apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantité à fabriquer doit être supérieur à 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantité à Fabriquer doit être supérieur à 0.
apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Rapport de visite pour l'appel de maintenance
DocType: Stock Entry,Update Rate and Availability,Mettre à jour prix et disponibilité
DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou de livrer plus sur la quantité commandée. Par exemple: Si vous avez commandé 100 unités. et votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
@@ -3375,7 +3375,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Quittance
,Sales Register,Registre des ventes
DocType: Daily Work Summary Settings Company,Send Emails At,Envoyer Emails A
-DocType: Quotation,Quotation Lost Reason,Perdu la raison de la Soumission
+DocType: Quotation,Quotation Lost Reason,Raison de la Perte du Devis
apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Sélectionnez votre domaine
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Référence de la transaction ne {0} daté {1}
apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
@@ -3414,7 +3414,7 @@
DocType: Supplier Quotation,Supplier Address,Adresse du fournisseur
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Le budget du compte {1} contre {2} {3} est {4}. Il dépassera de {5}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +665,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Le compte doit être de type 'Asset fixe'
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantité
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qté Sortante
apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,Règles de calcul du montant de l'expédition pour une vente
apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série est obligatoire
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Services Financiers
@@ -3473,7 +3473,7 @@
apps/erpnext/erpnext/controllers/item_variant.py +216,Invalid attribute {0} {1},attribut non valide {0} {1}
apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,S'il vous plaît sélectionner Groupe étudiant ou lot étudiant
DocType: Salary Slip,Earning & Deduction,Revenus et Déduction
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes écritures.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes transactions.
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
DocType: Holiday List,Weekly Off,Hebdomadaire Off
DocType: Fiscal Year,"For e.g. 2012, 2012-13","Par exemple: 2012, 2012-13"
@@ -3515,7 +3515,7 @@
DocType: Shipping Rule,Specify conditions to calculate shipping amount,Préciser les conditions pour calculer le montant de l'expédition
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à geler des comptes et modifier le contenu
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Conversion impossible du Centre de Coûts en livre car il possède des nœuds enfants
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valeur d'ouverture
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valeur d'Ouverture
DocType: Salary Detail,Formula,Formule
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,# Série
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Commission sur les Ventes
@@ -3526,7 +3526,7 @@
apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débit et Crédit non égaux pour {0} # {1}. La différence est de {2}.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Frais de Représentation
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Effectuer une demande de matériel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Article ouvert {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Ouvrir l'Article {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Facture de vente {0} doit être annulé avant l'annulation de cette commande client
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Âge
DocType: Sales Invoice Timesheet,Billing Amount,Montant de Facturation
@@ -3541,7 +3541,7 @@
DocType: Sales Partner,Logo,Logo
DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas de série par défaut si vous cochez cette case.
apps/erpnext/erpnext/stock/get_item_details.py +116,No Item with Serial No {0},Aucun Item avec le Numéro de Série {0}
-DocType: Email Digest,Open Notifications,Notifications ouvertes
+DocType: Email Digest,Open Notifications,Ouvrir les Notifications
DocType: Payment Entry,Difference Amount (Company Currency),Écart de Montant (Devise de la Société)
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Dépenses Directes
apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
@@ -3602,7 +3602,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abréviation est obligatoire
DocType: Project,Task Progress,progression de la tâche
,Qty to Transfer,Qté à Transférer
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis à Prospects ou Clients.
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis de Prospects ou Clients.
DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock gelé
,Territory Target Variance Item Group-Wise,Variance de région cible selon le groupe d'article
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Tous les Groupes Client
@@ -3635,7 +3635,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +449,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
DocType: Lead,Add to calendar on this date,Ajouter cette date au calendrier
apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Règles pour l'ajout de frais de port.
-DocType: Item,Opening Stock,Stock d'ouverture
+DocType: Item,Opening Stock,Stock d'Ouverture
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Client est requis
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour le retour
DocType: Purchase Order,To Receive,A Recevoir
@@ -3649,14 +3649,14 @@
Updated via 'Time Log'","Mise à jour en quelques minutes
via 'Log Time'"
DocType: Customer,From Lead,Du Prospect
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validé pour la production.
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validées pour la production.
apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Sélectionnez Exercice ...
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +512,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une entrée PDV
DocType: Program Enrollment Tool,Enroll Students,Inscrire des Étudiants
DocType: Hub Settings,Name Token,Nom du jeton
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente standard
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
-DocType: Serial No,Out of Warranty,Hors garantie
+DocType: Serial No,Out of Warranty,Hors Garantie
DocType: BOM Replace Tool,Replace,Remplacer
DocType: Production Order,Unstopped,débouchées
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
@@ -3677,9 +3677,9 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipements Électroniques
DocType: Account,Debit,Débit
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Les Congés doivent être alloués par multiples de 0,5"
-DocType: Production Order,Operation Cost,Coût de l'opération
+DocType: Production Order,Operation Cost,Coût de l'Opération
apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Télécharger les participations à partir d'un fichier .csv
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Exceptionnelle Amt
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Montant en suspens
DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fixer des objectifs élément de groupe-sage pour cette personne des ventes.
DocType: Stock Settings,Freeze Stocks Older Than [Days],Geler les Articles plus Anciens que [Jours]
apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset est obligatoire pour les immobilisations achat / vente
@@ -3734,7 +3734,7 @@
DocType: Student Group Creation Tool,Get Courses,Obtenir les Cours
DocType: GL Entry,Party,Intervenants
DocType: Sales Order,Delivery Date,Date de Livraison
-DocType: Opportunity,Opportunity Date,Date de possibilité
+DocType: Opportunity,Opportunity Date,Date d'Opportunité
DocType: Purchase Receipt,Return Against Purchase Receipt,Retour contre Reçu d'achat
DocType: Request for Quotation Item,Request for Quotation Item,Article de L'Appel d'offre
DocType: Purchase Order,To Bill,A facturer
@@ -3811,7 +3811,7 @@
DocType: BOM Scrap Item,BOM Scrap Item,Article Mis au Rebut LDM
apps/erpnext/erpnext/accounts/page/pos/pos.js +845,Submitted orders can not be deleted,commandes passées ne peuvent pas être supprimés
apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà débiteur, vous n'êtes pas autorisé à définir 'Solde Doit Être' comme 'Créditeur'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestion de la qualité
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestion de la Qualité
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,L'article {0} a été désactivé
DocType: Employee Loan,Repay Fixed Amount per Period,Rembourser montant fixe par période
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},S'il vous plaît entrer la qté de l'article {0}
@@ -3878,7 +3878,7 @@
DocType: Company,Distribution,Distribution
apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Montant Payé
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Chef de projet
-,Quoted Item Comparison,Comparaison d'article soumissionné
+,Quoted Item Comparison,Comparaison d'Article Soumis
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Envoi
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Réduction maximum autorisée pour l'article: {0} est de {1} %
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,La valeur nette d'inventaire que sur
@@ -3898,7 +3898,7 @@
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
DocType: Salary Detail,Component,Composant
DocType: Assessment Criteria,Assessment Criteria Group,Groupe de Critère d'Évaluation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Ouverture Amortissement cumulé doit être inférieur ou égal à {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
DocType: Warehouse,Warehouse Name,Nom de l'entrepôt
DocType: Naming Series,Select Transaction,Sélectionner Transaction
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,S'il vous plaît entrer approuver ou approuver Rôle utilisateur
@@ -4005,7 +4005,7 @@
DocType: Salary Detail,Default Amount,Montant par Défaut
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Entrepôt pas trouvé dans le système
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Résumé de ce mois-ci
-DocType: Quality Inspection Reading,Quality Inspection Reading,Libellé du contrôle de qualité
+DocType: Quality Inspection Reading,Quality Inspection Reading,Libellé du Contrôle de Qualité
apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Figer les stocks datant de plus` doit être inférieur que %d jours.
DocType: Tax Rule,Purchase Tax Template,Modèle de taxes pour achats
,Project wise Stock Tracking,Projet sage Stock Tracking
@@ -4022,11 +4022,11 @@
apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Sélectionnez une marque ...
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortissement Cumulé depuis
DocType: Sales Invoice,C-Form Applicable,Formulaire-C Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l'opération {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Temps de l'Opération doit être supérieur à 0 pour l'Opération {0}
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,Entrepôt est obligatoire
DocType: Supplier,Address and Contacts,Adresse et Contacts
DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Unité de mesure
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web convivial , ex.. 900px par 100px"
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Garder le compatible avec le web 900px par 100px
DocType: Program,Program Abbreviation,Abréviation du programme
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ordre de production ne peut être soulevée contre un modèle d'objet
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour dans le Reçu d'Achat pour chaque article
@@ -4047,11 +4047,11 @@
DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com / api / send_sms.cgi
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Transaction currency must be same as Payment Gateway currency,Devise de la transaction doit être la même que la monnaie paiement passerelle
DocType: Payment Entry,Receive,Recevoir
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Soumission:
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Devis :
DocType: Maintenance Visit,Fully Completed,Entièrement Complété
apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
DocType: Employee,Educational Qualification,Qualification pour l'Éducation
-DocType: Workstation,Operating Costs,Coûts d'exploitation
+DocType: Workstation,Operating Costs,Coûts d'Exploitation
DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le Budget Mensuel Cumulé est Dépassé
DocType: Purchase Invoice,Submit on creation,Soumettre sur la création
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Devise pour {0} doit être {1}
@@ -4076,7 +4076,7 @@
apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Récapitulatif Quotidien de Travail pour {0}
DocType: Employee Loan,Totals,Totaux
DocType: BOM,Manufacturing,Fabrication
-,Ordered Items To Be Delivered,Articles commandés à livrer
+,Ordered Items To Be Delivered,Articles Commandés à Livrer
DocType: Account,Income,Revenu
DocType: Industry Type,Industry Type,Secteur d'activité
apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Quelque chose a mal tourné !
@@ -4090,7 +4090,7 @@
DocType: Fee Structure,Student Category,étudiant Catégorie
apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obligatoire - Obtenir des étudiants de
DocType: Announcement,Student,Élève
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unité d'organisation (département) maître .
+apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Base d'unité d'organisation (département).
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,S'il vous plaît entrez No mobiles valides
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,S'il vous plaît entrer le message avant d'envoyer
DocType: Email Digest,Pending Quotations,Soumissions en attente
@@ -4166,7 +4166,7 @@
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Le Compte Clôturé {0} doit être de type Passif / Capitaux Propres
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip de salaire de l'employé {0} déjà créé pour la feuille de temps {1}
DocType: Vehicle Log,Odometer,Odomètre
-DocType: Sales Order Item,Ordered Qty,Quantité commandée
+DocType: Sales Order Item,Ordered Qty,Qté Commandée
apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Article {0} est désactivé
DocType: Stock Settings,Stock Frozen Upto,Stock gelé jusqu'au
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +876,BOM does not contain any stock item,LDM ne contient aucun article en stock
@@ -4186,7 +4186,7 @@
apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},S'il vous plaît définir {0}
DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
DocType: Employee,Health Details,Détails de Santé
-DocType: Offer Letter,Offer Letter Terms,Offrez Conditions Lettre
+DocType: Offer Letter,Offer Letter Terms,Termes de la Lettre de Proposition
DocType: Payment Entry,Allocate Payment Amount,Allouer le Montant du Paiement
DocType: Employee External Work History,Salary,Salaire
DocType: Serial No,Delivery Document Type,Type de Document de Livraison
@@ -4225,7 +4225,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Service Client
DocType: BOM,Thumbnail,Vignette
DocType: Item Customer Detail,Item Customer Detail,Détail de l'article client
-apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Offrir un Emploi au Candidat
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Proposer un Emploi au candidat
DocType: Notification Control,Prompt for Email on Submission of,Prompt for Email relative à la présentation des
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Nombre de feuilles alloués sont plus de jours de la période
DocType: Pricing Rule,Percentage,Pourcentage
@@ -4297,7 +4297,7 @@
apps/erpnext/erpnext/config/selling.py +67,Price List master.,Liste de prix principale.
DocType: Task,Review Date,Date de révision
DocType: Purchase Invoice,Advance Payments,Paiements Anticipés
-DocType: Purchase Taxes and Charges,On Net Total,Sur le total Net
+DocType: Purchase Taxes and Charges,On Net Total,Sur le Total Net
apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valeur pour l'attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3} pour le poste {4}
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Entrepôt cible à la ligne {0} doit être le même que l'ordre de fabrication
apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
@@ -4417,7 +4417,7 @@
DocType: Employee,Education,Education
DocType: Selling Settings,Campaign Naming By,Campagne Nommée Par
DocType: Employee,Current Address Is,L'Adresse Actuelle est
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défaut de la société sera définie si le champ est laissé vide.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optionnel. Défini la devise par défaut de l'entreprise, si non spécifié."
apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Les écritures comptables.
DocType: Delivery Note Item,Available Qty at From Warehouse,Qté Disponible Depuis l'Entrepôt
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,S'il vous plaît sélectionnez dossier de l'employé en premier.
@@ -4458,7 +4458,7 @@
,Monthly Salary Register,Registre mensuel des salaires
DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
DocType: BOM Operation,BOM Operation,Opération LDM
-DocType: Purchase Taxes and Charges,On Previous Row Amount,Le montant rangée précédente
+DocType: Purchase Taxes and Charges,On Previous Row Amount,Le Montant de la Rangée Précédente
DocType: Student,Home Address,Adresse du Domicile
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfert d'actifs
DocType: POS Profile,POS Profile,Profil PDV
@@ -4557,7 +4557,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Réf. date
DocType: Employee,Reason for Leaving,Raison du départ
-DocType: BOM Operation,Operating Cost(Company Currency),Coût d'exploitation (Société Monnaie)
+DocType: BOM Operation,Operating Cost(Company Currency),Coût d'Exploitation (Devise Société)
DocType: Employee Loan Application,Rate of Interest,Taux d'intérêt
DocType: Expense Claim Detail,Sanctioned Amount,Montant approuvé
DocType: GL Entry,Is Opening,Est l'ouverture
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index e391c36..ba84c4e 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -639,7 +639,7 @@
apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatski aktivira se zahtjev povratne informacije na temelju uvjeta.
DocType: Employee,Reason for Resignation,Razlog za ostavku
apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Predložak za ocjene rada .
-DocType: Sales Invoice,Credit Note Issued,Kreditne Napomena Izdano
+DocType: Sales Invoice,Credit Note Issued,Odobrenje kupcu izdano
DocType: Project Task,Weight,Težina
DocType: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Temeljnica Detalji
apps/erpnext/erpnext/accounts/utils.py +84,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nije u fiskalnoj godini {2}
@@ -2396,7 +2396,7 @@
DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
DocType: Lead Source,Source Name,source Name
-DocType: Journal Entry,Credit Note,Kreditne Napomena
+DocType: Journal Entry,Credit Note,Odobrenje kupcu
DocType: Warranty Claim,Service Address,Usluga Adresa
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Namještaja i rasvjete
DocType: Item,Manufacture,Proizvodnja
@@ -3559,7 +3559,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probni rad
apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Povratak / kreditne Napomena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Povrat / odobrenje kupcu
DocType: Stock Settings,Auto insert Price List rate if missing,"Ako ne postoji, automatski ubaciti cjenik"
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
DocType: Production Order Item,Transferred Qty,prebačen Kol
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 5b8cb2a..0406c92 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -163,7 +163,7 @@
DocType: Employee Loan,Repay Over Number of Periods,Rimborsare corso Numero di periodi
DocType: Stock Entry,Additional Costs,Costi aggiuntivi
apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Account con transazioni registrate non può essere convertito a gruppo.
-DocType: Lead,Product Enquiry,Prodotto Inchiesta
+DocType: Lead,Product Enquiry,Richiesta di informazioni sui prodotti
DocType: Academic Term,Schools,scuole
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nessun record congedo trovato per dipendente {0} per {1}
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Inserisci prima azienda
@@ -242,7 +242,7 @@
apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Le modalità di applicazione di prezzi e sconti .
apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
-DocType: Pricing Rule,Discount on Price List Rate (%),Sconto Listino Tasso (%)
+DocType: Pricing Rule,Discount on Price List Rate (%),Sconto su Prezzo di Listino (%)
DocType: Offer Letter,Select Terms and Conditions,Selezionare i Termini e Condizioni
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valore out
DocType: Production Planning Tool,Sales Orders,Ordini di vendita
@@ -1063,7 +1063,7 @@
DocType: Packing Slip Item,Packing Slip Item,Distinta di imballaggio articolo
DocType: Purchase Invoice,Cash/Bank Account,Conto Cassa/Banca
apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Si prega di specificare un {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eliminati elementi senza variazione di quantità o valore.
DocType: Delivery Note,Delivery To,Consegna a
apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Tavolo attributo è obbligatorio
DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
@@ -2553,7 +2553,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,Preventivo {0} è annullato
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Importo totale Eccezionale
DocType: Sales Partner,Targets,Obiettivi
-DocType: Price List,Price List Master,Listino Maestro
+DocType: Price List,Price List Master,Listino Principale
DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tutte le transazioni di vendita possono essere etichettati contro più persone ** ** di vendita in modo da poter impostare e monitorare gli obiettivi.
,S.O. No.,S.O. No.
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
@@ -3369,7 +3369,7 @@
DocType: BOM,Website Description,Descrizione del sito
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variazione netta Patrimonio
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +152,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Indirizzo e-mail deve essere unico, esiste già per {0}"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Indirizzo e-mail deve essere univoco, esiste già per {0}"
DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Ricevuta
,Sales Register,Registro Vendite
@@ -4032,7 +4032,7 @@
apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Allocare le foglie per un periodo .
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Assegni e depositi cancellati in modo non corretto
apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Account {0}: non è possibile assegnare se stesso come conto principale
-DocType: Purchase Invoice Item,Price List Rate,Prezzo di listino Vota
+DocType: Purchase Invoice Item,Price List Rate,Prezzo di Listino
apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Creare le citazioni dei clienti
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostra "Disponibile" o "Non disponibile" sulla base di scorte disponibili in questo magazzino.
apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Distinte materiali (BOM)
@@ -4164,7 +4164,7 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
DocType: Vehicle Log,Odometer,Odometro
DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Articolo {0} è disattivato
DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +876,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 6fc1c3e..3b707f3 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -2182,7 +2182,7 @@
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Sales Invoice Advance,Advance Amount,ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣ
DocType: Manufacturing Settings,Capacity Planning,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,' ದಿನಾಂಕದಿಂದ ' ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,ಇಂದ ದಿನಾಂಕ ಬೇಕು
DocType: Journal Entry,Reference Number,ಉಲ್ಲೇಖ ಸಂಖ್ಯೆ
DocType: Employee,Employment Details,ಉದ್ಯೋಗದ ವಿವರಗಳು
DocType: Employee,New Workplace,ಹೊಸ ಕೆಲಸದ
@@ -2885,7 +2885,7 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +86,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +871,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' ದಿನಾಂಕದಿಂದ ' ' ದಿನಾಂಕ ' ನಂತರ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ಇಂದ ದಿನಾಂಕ, ಗೆ ದಿನಾಂಕದ ಆಮೇಲೆ ಬರಬೇಕು"
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 063c2ff..4173c3e 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -337,7 +337,7 @@
DocType: Employee,Health Concerns,Preocupações com a Saúde
DocType: Process Payroll,Select Payroll Period,Selecione Período de Pagamento
DocType: Process Payroll,Select Payroll Period,Selecione Período de Pagamento
-DocType: Packing Slip,From Package No.,De No. Package
+DocType: Packing Slip,From Package No.,Do nº do pacote
DocType: Item Attribute,To Range,Para a Faixa
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total de folhas alocados é obrigatória
DocType: Job Opening,Description of a Job Opening,Descrição de uma vaga de emprego
@@ -833,6 +833,7 @@
DocType: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se considerado para todos os ramos
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma não é aplicável para a fatura: {0}
DocType: Payment Reconciliation,Unreconciled Payment Details,Detalhes do Pagamento não Conciliado
+DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +436,'Entries' cannot be empty,'Entradas' não pode estar vazio
apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Configurando Colaboradores
DocType: Sales Order,SO-,OV-
@@ -885,7 +886,7 @@
DocType: Email Digest,Add Quote,Adicionar Citar
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Fator de Conversão de Unidade de Medida é necessário para Unidade de Medida: {0} no Item: {1}
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,Row {0}: Qty is mandatory,Linha {0}: Qtde é obrigatória
-apps/erpnext/erpnext/accounts/page/pos/pos.js +714,Sync Master Data,Sincronizar com o servidor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +714,Sync Master Data,Sincronizar com o Servidor
apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Seus Produtos ou Serviços
DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
@@ -988,6 +989,7 @@
DocType: GL Entry,GL Entry,Lançamento GL
DocType: HR Settings,Employee Settings,Configurações de Colaboradores
,Batch-Wise Balance History,Balanço por Histórico de Lotes
+DocType: Package Code,Package Code,Código do pacote
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativo Quantidade não é permitido
DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
Used for Taxes and Charges",Detalhe da tabela de imposto obtido a partir do cadastro do item como texto e armazenado neste campo. Usado para Tributos e Encargos
@@ -1225,7 +1227,7 @@
DocType: Asset Movement,Asset Movement,Movimentação de Ativos
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} não é um item serializado
DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
-DocType: Packing Slip,To Package No.,Para Pacote Nº.
+DocType: Packing Slip,To Package No.,Até nº do pacote
DocType: Production Planning Tool,Material Requests,Requisições de Material
DocType: Warranty Claim,Issue Date,Data do Incidente
DocType: Sales Invoice Timesheet,Timesheet Detail,Detalhes do Registro de Tempo
@@ -1746,6 +1748,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referência
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovante #
DocType: Notification Control,Purchase Order Message,Mensagem do Pedido de Compra
+DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Esconder CPF/CNPJ em transações de vendas
DocType: Upload Attendance,Upload HTML,Upload HTML
DocType: Employee,Relieving Date,Data da Liberação
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
@@ -2049,6 +2052,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reembolso de Despesa para o Log do Veículo {0}
DocType: Sales Partner,Retailer,Varejista
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
+DocType: Global Defaults,Disable In Words,Desativar por extenso
apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},O Orçamento {0} não é do tipo {1}
DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index c103a66..de1bccf 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1035,7 +1035,7 @@
DocType: Timesheet Detail,Bill,Fatura
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Branco
-DocType: SMS Center,All Lead (Open),Todos Pot. Clientes (Abertos)
+DocType: SMS Center,All Lead (Open),Todos Potenciais Clientes (Abertos)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: A qtd não está disponível para {4} no armazém {1} no momento da postagem do registo ({2} {3})
DocType: Purchase Invoice,Get Advances Paid,Obter Adiantamentos Pagos
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +763,Make ,Efetuar
@@ -1187,7 +1187,7 @@
DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,O seu vendedor receberá um lembrete nesta data para contatar o cliente
apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Mesmo item não pode ser inserido várias vezes.
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados em Fora do Grupo"
-DocType: Lead,Lead,Pot Clie
+DocType: Lead,Lead,Potenciais Clientes
DocType: Email Digest,Payables,A Pagar
DocType: Course,Course Intro,Introdução do Curso
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Registo de Stock {0} criado
@@ -1549,7 +1549,7 @@
DocType: Purchase Receipt,PREC-,RECC-
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
,Bank Reconciliation Statement,Declaração de Conciliação Bancária
-,Lead Name,Nome de Pot Client
+,Lead Name,Nome de Potencial Cliente
,POS,POS
DocType: C-Form,III,III
apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Saldo de Stock Inicial
@@ -2433,7 +2433,7 @@
apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir Valores Padrão, como a Empresa, Moeda, Ano Fiscal Atual, etc."
DocType: Payment Entry,Payment Type,Tipo de Pagamento
DocType: Process Payroll,Select Employees,Selecionar Funcionários
-DocType: Opportunity,Potential Sales Deal,Negócio de Vendas Potencial
+DocType: Opportunity,Potential Sales Deal,Potenciais Negócios de Vendas
DocType: Payment Entry,Cheque/Reference Date,Data do Cheque/Referência
DocType: Purchase Invoice,Total Taxes and Charges,Impostos e Encargos Totais
DocType: Employee,Emergency Contact,Contacto de Emergência
@@ -3341,7 +3341,7 @@
using Stock Reconciliation","O Item em Série {0} não pode ser atualizado utilizando \
a Reconciliação de Stock"
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,O Novo Nr. de Série não pode ter um Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra
-DocType: Lead,Lead Type,Tipo Pot. Cliente
+DocType: Lead,Lead Type,Tipo Potencial Cliente
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Não está autorizado a aprovar licenças em Datas Bloqueadas
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +364,All these items have already been invoiced,Todos estes itens já foram faturados
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
@@ -3457,7 +3457,7 @@
DocType: Payment Entry,Account Paid From,Conta Paga De
DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matéria-prima
DocType: Journal Entry,Write Off Based On,Liquidação Baseada Em
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Faça chumbo
+apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Crie um Potencial Cliente
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impressão e artigos de papelaria
DocType: Stock Settings,Show Barcode Field,Mostrar Campo do Código de Barras
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar Emails de Fornecedores
@@ -3648,7 +3648,7 @@
DocType: Production Order Operation,"in Minutes
Updated via 'Time Log'","em Minutos
Atualizado através do ""Registo de Tempo"""
-DocType: Customer,From Lead,Do Pot. Cliente
+DocType: Customer,From Lead,Do Potencial Cliente
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pedidos lançados para a produção.
apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecione o Ano Fiscal...
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +512,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
@@ -3966,7 +3966,7 @@
DocType: Customer,Sales Team Details,Dados de Equipa de Vendas
apps/erpnext/erpnext/accounts/page/pos/pos.js +1252,Delete permanently?,Eliminar permanentemente?
DocType: Expense Claim,Total Claimed Amount,Montante Reclamado Total
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais de venda.
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciais oportunidades de venda.
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Inválido {0}
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Licença de Doença
DocType: Email Digest,Email Digest,Email de Resumo
@@ -3997,7 +3997,7 @@
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Período
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Razão Geral
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} em licença {1}
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver Pot. Clientes
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver Potenciais Clientes
DocType: Program Enrollment Tool,New Program,Novo Programa
DocType: Item Attribute Value,Attribute Value,Valor do Atributo
,Itemwise Recommended Reorder Level,Nível de Reposição Recomendada por Item
@@ -4199,7 +4199,7 @@
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Itens sincronizados
DocType: Sales Order,Partly Delivered,Parcialmente Entregue
DocType: Email Digest,Receivables,A Receber
-DocType: Lead Source,Lead Source,Fonte de Pot. Cliente
+DocType: Lead Source,Lead Source,Fonte de Potencial Cliente
DocType: Customer,Additional information regarding the customer.,Informações adicionais acerca do cliente.
DocType: Quality Inspection Reading,Reading 5,Leitura 5
DocType: Maintenance Visit,Maintenance Date,Data de Manutenção
