fix: Merge branch 'develop' into healthcare_refactor

README.md

@@ -15,18 +15,18 @@
 
 ERPNext as a monolith includes the following areas for managing businesses:
 
-1. [Accounting](https://erpnext.com/docs/user/manual/en/accounts)
+1. [Accounting](https://erpnext.com/open-source-accounting)
-1. [Inventory](https://erpnext.com/docs/user/manual/en/stock)
+1. [Inventory](https://erpnext.com/distribution/inventory-management-system)
-1. [CRM](https://erpnext.com/docs/user/manual/en/CRM)
+1. [CRM](https://erpnext.com/open-source-crm)
-1. [Sales](https://erpnext.com/docs/user/manual/en/selling)
+1. [Sales](https://erpnext.com/open-source-sales-purchase)
-1. [Purchase](https://erpnext.com/docs/user/manual/en/buying)
+1. [Purchase](https://erpnext.com/open-source-sales-purchase)
-1. [HRMS](https://erpnext.com/docs/user/manual/en/human-resources)
+1. [HRMS](https://erpnext.com/open-source-hrms)
-1. [Project Management](https://erpnext.com/docs/user/manual/en/projects)
+1. [Project Management](https://erpnext.com/open-source-projects)
-1. [Support](https://erpnext.com/docs/user/manual/en/support)
+1. [Support](https://erpnext.com/open-source-help-desk-software)
-1. [Asset Management](https://erpnext.com/docs/user/manual/en/asset)
+1. [Asset Management](https://erpnext.com/open-source-asset-management-software)
 1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management)
-1. [Manufacturing](https://erpnext.com/docs/user/manual/en/manufacturing)
+1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software)
-1. [Website Management](https://erpnext.com/docs/user/manual/en/website)
+1. [Website Management](https://erpnext.com/open-source-website-builder-software)
 1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext)
 1. [And More](https://erpnext.com/docs/user/manual/en/)
 

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -26,7 +26,7 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 		to_date = chart.to_date
 
 	timegrain = chart.time_interval
-	filters = frappe.parse_json(chart.filters_json)
+	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
 
 	account = filters.get("account")
 	company = filters.get("company")

erpnext/accounts/doctype/account/account.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_copy": 1,
  "allow_import": 1,
  "creation": "2013-01-30 12:49:46",
@@ -196,10 +197,13 @@
  ],
  "icon": "fa fa-money",
  "idx": 1,
- "modified": "2019-10-10 19:10:02.967554",
+ "is_tree": 1,
+ "links": [],
+ "modified": "2020-03-18 17:57:52.063233",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
+ "nsm_parent_field": "parent_account",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04_with_account_number.json

@@ -406,11 +406,11 @@
                         "is_group": 1,
                         "Bewertungskorrektur zu Forderungen aus Lieferungen und Leistungen": {
                             "account_number": "9960"
-						},
+                        },
-						"Debitoren": {
+                        "Debitoren": {
-							"is_group": 1,
+                            "is_group": 1,
-							"account_number": "10000"
+                            "account_number": "10000"
-						},
+                        },
                         "Forderungen aus Lieferungen und Leistungen": {
                             "account_number": "1200",
                             "account_type": "Receivable"
@@ -663,16 +663,22 @@
                                 "account_number": "1400"
                             },
                             "Abziehbare Vorsteuer 7 %": {
-                                "account_number": "1401"
+                                "account_number": "1401",
+                                "account_type": "Tax",
+                                "tax_rate": 7.0
                             },
                             "Abziehbare Vorsteuer aus innergem. Erwerb": {
                                 "account_number": "1402"
                             },
                             "Abziehbare Vorsteuer aus innergem. Erwerb 19%": {
-                                "account_number": "1404"
+                                "account_number": "1404",
+                                "account_type": "Tax",
+                                "tax_rate": 19.0
                             },
                             "Abziehbare Vorsteuer 19 %": {
-                                "account_number": "1406"
+                                "account_number": "1406",
+                                "account_type": "Tax",
+                                "tax_rate": 19.0
                             },
                             "Abziehbare Vorsteuer nach \u00a7 13b UStG 19 %": {
                                 "account_number": "1407"
@@ -911,17 +917,31 @@
                 "is_group": 1,
                 "I - Gezeichnetes Kapital": {
                     "account_type": "Equity",
-                    "is_group": 1
+					"is_group": 1,
+					"Gezeichnetes Kapital": {
+						"account_type": "Equity",
+						"account_number": "2900"
+					},
+					"Ausstehende Einlagen auf das gezeichnete Kapital": {
+						"account_number": "2910",
+						"is_group": 1
+					}
                 },
                 "II - Kapitalr\u00fccklage": {
                     "account_type": "Equity",
-                    "is_group": 1
+					"is_group": 1,
+					"Kapitalr\u00fccklage": {
+						"account_number": "2920"
+					}
                 },
                 "III - Gewinnr\u00fccklagen": {
                     "account_type": "Equity",
                     "1 - gesetzliche R\u00fccklage": {
                         "account_type": "Equity",
-                        "is_group": 1
+						"is_group": 1,
+						"Gesetzliche R\u00fccklage": {
+							"account_number": "2930"
+						}
                     },
                     "2 - R\u00fccklage f. Anteile an einem herrschenden oder mehrheitlich beteiligten Unternehmen": {
                         "account_type": "Equity",
@@ -929,7 +949,10 @@
                     },
                     "3 - satzungsm\u00e4\u00dfige R\u00fccklagen": {
                         "account_type": "Equity",
-                        "is_group": 1
+						"is_group": 1,
+						"Satzungsm\u00e4\u00dfige R\u00fccklagen": {
+							"account_number": "2950"
+						}
                     },
                     "4 - andere Gewinnr\u00fccklagen": {
                         "account_type": "Equity",
@@ -963,7 +986,13 @@
                 },
                 "IV - Gewinnvortrag/Verlustvortrag": {
                     "account_type": "Equity",
-                    "is_group": 1
+                    "is_group": 1,
+					"Gewinnvortrag vor Verwendung": {
+						"account_number": "2970"
+					},
+					"Verlustvortrag vor Verwendung": {
+						"account_number": "2978"
+					}
                 },
                 "V - Jahres\u00fcberschu\u00df/Jahresfehlbetrag": {
                     "account_type": "Equity",
@@ -1197,15 +1226,15 @@
                     "is_group": 1,
                     "Bewertungskorrektur zu Verb. aus Lieferungen und Leistungen": {
                         "account_number": "9964"
-					},
+                    },
-					"Kreditoren": {
+                    "Kreditoren": {
-						"account_number": "70000",
+                        "account_number": "70000",
-						"is_group": 1,
+                        "is_group": 1,
-						"Wareneingangs-­Verrechnungskonto" : {
+                        "Wareneingangs-­Verrechnungskonto" : {
-							"account_number": "70001",
+                            "account_number": "70001",
-							"account_type": "Stock Received But Not Billed"
+                            "account_type": "Stock Received But Not Billed"
-						}
+                        }
-					},
+                    },
                     "Verb. aus Lieferungen und Leistungen": {
                         "account_number": "3300",
                         "account_type": "Payable"
@@ -1488,17 +1517,21 @@
                         },
                         "Umsatzsteuer 7 %": {
                             "account_number": "3801",
-                            "account_type": "Tax"
+                            "account_type": "Tax",
+                            "tax_rate": 7.0
                         },
                         "Umsatzsteuer aus innergem. Erwerb": {
                             "account_number": "3802"
                         },
                         "Umsatzsteuer aus innergem. Erwerb 19 %": {
-                            "account_number": "3804"
+                            "account_number": "3804",
+                            "account_type": "Tax",
+                            "tax_rate": 19.0
                         },
                         "Umsatzsteuer 19 %": {
                             "account_number": "3806",
-                            "account_type": "Tax"
+                            "account_type": "Tax",
+                            "tax_rate": 19.0
                         },
                         "Umsatzsteuer aus im Inland steuerpfl. EU-Lieferungen": {
                             "account_number": "3807"
@@ -1653,7 +1686,15 @@
             "Erl\u00f6se 7 % USt": {
                 "account_number": "4300",
                 "account_type": "Income Account"
-            },
+			},
+			"Erl\u00f6se 16 % USt": {
+				"account_number": "4340",
+                "account_type": "Income Account"
+			},
+			"Erl\u00f6se 19 % USt": {
+				"account_number": "4400",
+				"account_type": "Income Account"
+			},
             "Erl\u00f6se aus im Inland steuerpfl. EU-Lieferungen 7 % USt": {
                 "account_number": "4310"
             },
@@ -1681,19 +1722,6 @@
             "Erl\u00f6se aus im anderen EU-Land steuerbaren Leistungen, im Inland nicht steuerbare Ums\u00e4tze": {
                 "account_number": "4339"
             },
-            "Erl\u00f6se 16 % USt (Gruppe)": {
-                "is_group": 1,
-                "Erl\u00f6se 16 % USt": {
-                    "account_number": "4340"
-                }
-            },
-            "Erl\u00f6se 19 % USt (Gruppe)": {
-                "is_group": 1,
-                "Erl\u00f6se 19 % USt": {
-                    "account_number": "4400",
-                    "account_type": "Income Account"
-                }
-            },
             "Grundst\u00fccksertr\u00e4ge (Gruppe)": {
                 "is_group": 1,
                 "Grundst\u00fccksertr\u00e4ge": {
@@ -1752,14 +1780,12 @@
         "2 - Herstellungskosten der zur Erzielung der Umsatzerl\u00f6se erbrachten Leistungen": {
             "root_type": "Expense",
             "is_group": 1,
-            "Herstellungskosten (Gruppe)": {
+			"Herstellungskosten": {
-                "Herstellungskosten": {
+				"account_number": "6990",
-                    "account_number": "6990",
+				"account_type": "Cost of Goods Sold"
-                    "account_type": "Cost of Goods Sold"
+			},
-                },
+			"Herstellungskosten: Schwund": {
-                "Herstellungskosten: Schwund": {
+				"account_type": "Stock Adjustment"
-                    "account_type": "Stock Adjustment"
-                }
             },
             "Aufwendungen f. Roh-, Hilfs- und Betriebsstoffe und f. bezogene Waren": {
                 "account_number": "5000",
@@ -1809,10 +1835,10 @@
                     "Energiestoffe (Fertigung)": {
                         "account_number": "5190"
                     },
-                    "Energiestoffe (Fertigung)7% Vorsteuer": {
+                    "Energiestoffe (Fertigung) 7% Vorsteuer": {
                         "account_number": "5191"
                     },
-                    "Energiestoffe (Fertigung)19% Vorsteuer": {
+                    "Energiestoffe (Fertigung) 19% Vorsteuer": {
                         "account_number": "5192"
                     }
                 }
@@ -1935,49 +1961,49 @@
                 },
                 "Nachl\u00e4sse aus innergem. Erwerb 15 % Vorsteuer und 15 % Umsatzsteuer": {
                     "account_number": "5727"
-                },
+				}
-                "Erhaltene Skonti (Gruppe)": {
+			},
-                    "is_group": 1,
+			"Erhaltene Skonti (Gruppe)": {
-                    "Erh. Skonti": {
+				"is_group": 1,
-                        "account_number": "5730"
+				"Erh. Skonti": {
-                    },
+					"account_number": "5730"
-                    "Erh. Skonti 7 % Vorsteuer": {
+				},
-                        "account_number": "5731"
+				"Erh. Skonti 7 % Vorsteuer": {
-                    },
+					"account_number": "5731"
-                    "Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+				},
-                        "account_number": "5733"
+				"Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-                    },
+					"account_number": "5733"
-                    "Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+				},
-                        "account_number": "5734"
+				"Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-                    },
+					"account_number": "5734"
-                    "Erh. Skonti 19 % Vorsteuer": {
+				},
-                        "account_number": "5736"
+				"Erh. Skonti 19 % Vorsteuer": {
-                    },
+					"account_number": "5736"
-                    "Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+				},
-                        "account_number": "5738"
+				"Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-                    },
+					"account_number": "5738"
-                    "Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe aus steuerpfl. innergem. Erwerb 19% Vorst. u. 19% Ust.": {
+				},
-                        "account_number": "5741"
+				"Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe aus steuerpfl. innergem. Erwerb 19% Vorst. u. 19% Ust.": {
-                    },
+					"account_number": "5741"
-                    "Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe aus steuerpfl. innergem. Erwerb 7% Vorst. u. 7% Ust.": {
+				},
-                        "account_number": "5743"
+				"Erh. Skonti aus Einkauf Roh-, Hilfs- und Betriebsstoffe aus steuerpfl. innergem. Erwerb 7% Vorst. u. 7% Ust.": {
-                    },
+					"account_number": "5743"
-                    "Erh. Skonti aus steuerpflichtigem innergem. Erwerb": {
+				},
-                        "account_number": "5745"
+				"Erh. Skonti aus steuerpflichtigem innergem. Erwerb": {
-                    },
+					"account_number": "5745"
-                    "Erh. Skonti aus steuerpflichtigem innergem. Erwerb 7% Vorst. u. 7% Ust.": {
+				},
-                        "account_number": "5746"
+				"Erh. Skonti aus steuerpflichtigem innergem. Erwerb 7% Vorst. u. 7% Ust.": {
-                    },
+					"account_number": "5746"
-                    "Erh. Skonti aus steuerpflichtigem innergem. Erwerb 19% Vorst. u. 19% Ust.": {
+				},
-                        "account_number": "5748"
+				"Erh. Skonti aus steuerpflichtigem innergem. Erwerb 19% Vorst. u. 19% Ust.": {
-                    },
+					"account_number": "5748"
-                    "Erh. Skonti aus Erwerb Roh-,Hilfs-,Betriebsstoff letzter Abn.innerh.Dreiecksg. 19% Vorst. und 19% Ust.": {
+				},
-                        "account_number": "5792"
+				"Erh. Skonti aus Erwerb Roh-,Hilfs-,Betriebsstoff letzter Abn.innerh.Dreiecksg. 19% Vorst. und 19% Ust.": {
-                    },
+					"account_number": "5792"
-                    "Erh. Skonti aus Erwerb Waren als letzter Abnehmer innerh. Dreiecksgesch. 19% Vorst. u. 19% Ust.": {
+				},
-                        "account_number": "5793"
+				"Erh. Skonti aus Erwerb Waren als letzter Abnehmer innerh. Dreiecksgesch. 19% Vorst. u. 19% Ust.": {
-                    }
+					"account_number": "5793"
-                }
+				}
             },
             "Bezugsnebenkosten (Gruppe)": {
                 "is_group": 1,
@@ -2295,49 +2321,49 @@
         },
         "6 - sonstige betriebliche Ertr\u00e4ge": {
             "root_type": "Income",
-			"is_group": 1,
+            "is_group": 1,
-			"Erhaltene Boni (Gruppe)": {
+            "Erhaltene Boni (Gruppe)": {
-				"is_group": 1,
+                "is_group": 1,
-				"Erhaltene Boni 7 % Vorsteuer": {
+                "Erhaltene Boni 7 % Vorsteuer": {
-					"account_number": "5750"
+                    "account_number": "5750"
-				},
+                },
-				"Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-					"account_number": "5753"
+                    "account_number": "5753"
-				},
+                },
-				"Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-					"account_number": "5754"
+                    "account_number": "5754"
-				},
+                },
-				"Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-					"account_number": "5755"
+                    "account_number": "5755"
-				},
+                },
-				"Erhaltene Boni 19 % Vorsteuer": {
+                "Erhaltene Boni 19 % Vorsteuer": {
-					"account_number": "5760"
+                    "account_number": "5760"
-				},
+                },
-				"Erhaltene Boni": {
+                "Erhaltene Boni": {
-					"account_number": "5769"
+                    "account_number": "5769"
-				}
+                }
-			},
+            },
-			"Erhaltene Rabatte (Gruppe)": {
+            "Erhaltene Rabatte (Gruppe)": {
-				"is_group": 1,
+                "is_group": 1,
-				"Erhaltene Rabatte": {
+                "Erhaltene Rabatte": {
-					"account_number": "5770"
+                    "account_number": "5770"
-				},
+                },
-				"Erhaltene Rabatte 7 % Vorsteuer": {
+                "Erhaltene Rabatte 7 % Vorsteuer": {
-					"account_number": "5780"
+                    "account_number": "5780"
-				},
+                },
-				"Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-					"account_number": "5783"
+                    "account_number": "5783"
-				},
+                },
-				"Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-					"account_number": "5784"
+                    "account_number": "5784"
-				},
+                },
-				"Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-					"account_number": "5785"
+                    "account_number": "5785"
-				},
+                },
-				"Erhaltene Rabatte 19 % Vorsteuer": {
+                "Erhaltene Rabatte 19 % Vorsteuer": {
-					"account_number": "5790"
+                    "account_number": "5790"
-				}
+                }
-			},
+            },
             "Andere aktivierte Eigenleistungen": {
                 "account_number": "4820"
             },
@@ -2660,8 +2686,8 @@
         },
         "7 - sonstige betriebliche Aufwendungen": {
             "root_type": "Expense",
-			"is_group": 1,
+            "is_group": 1,
-			"Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
+            "Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
                 "is_group": 1,
                 "Erl\u00f6sschm\u00e4lerungen": {
                     "account_number": "4700"
@@ -2744,7 +2770,7 @@
                 "Gew\u00e4hrte Rabatte 19 % USt": {
                     "account_number": "4790"
                 }
-			},
+            },
             "Sonstige betriebliche Aufwendungen": {
                 "account_number": "6300"
             },

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js

@@ -48,12 +48,6 @@ frappe.ui.form.on('Accounting Dimension', {
 		frm.set_value('label', frm.doc.document_type);
 		frm.set_value('fieldname', frappe.model.scrub(frm.doc.document_type));
 
-		if (frm.is_new()){
-			let row = frappe.model.add_child(frm.doc, "Accounting Dimension Detail", "dimension_defaults");
-			row.reference_document = frm.doc.document_type;
-			frm.refresh_fields("dimension_defaults");
-		}
-
 		frappe.db.get_value('Accounting Dimension', {'document_type': frm.doc.document_type}, 'document_type', (r) => {
 			if (r && r.document_type) {
 				frm.set_df_property('document_type', 'description', "Document type is already set as dimension");

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "field:label",
  "creation": "2019-05-04 18:13:37.002352",
  "doctype": "DocType",
@@ -46,7 +47,8 @@
    "options": "Accounting Dimension Detail"
   }
  ],
- "modified": "2019-07-17 16:49:31.134385",
+ "links": [],
+ "modified": "2020-03-22 20:34:39.805728",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension",
@@ -63,9 +65,20 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "write": 1
   }
  ],
- "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "ASC",
  "track_changes": 1

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -172,7 +172,7 @@ def get_doctypes_with_dimensions():
 	return doclist
 
 def get_accounting_dimensions(as_list=True):
-	accounting_dimensions = frappe.get_all("Accounting Dimension", fields=["label", "fieldname", "disabled"])
+	accounting_dimensions = frappe.get_all("Accounting Dimension", fields=["label", "fieldname", "disabled", "document_type"])
 
 	if as_list:
 		return [d.fieldname for d in accounting_dimensions]
@@ -186,6 +186,18 @@ def get_checks_for_pl_and_bs_accounts():
 
 	return dimensions
 
+def get_dimension_with_children(doctype, dimension):
+
+	if isinstance(dimension, list):
+		dimension = dimension[0]
+
+	all_dimensions = []
+	lft, rgt = frappe.db.get_value(doctype, dimension, ["lft", "rgt"])
+	children = frappe.get_all(doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]})
+	all_dimensions += [c.name for c in children]
+
+	return all_dimensions
+
 @frappe.whitelist()
 def get_dimension_filters():
 	dimension_filters = frappe.db.sql("""

erpnext/accounts/doctype/accounts_settings/regional/united_states.js

@@ -0,0 +1,8 @@
+
+frappe.ui.form.on('Accounts Settings', {
+	refresh: function(frm) {
+		frm.set_df_property("acc_frozen_upto", "label", "Books Closed Through");
+		frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods");
+		frm.set_df_property("credit_controller", "label", "Credit Manager");
+	}
+});

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe.model.document import Document
 from frappe import _
+from frappe.desk.search import sanitize_searchfield
 
 class BankGuarantee(Document):
 	def validate(self):
@@ -22,5 +23,8 @@ class BankGuarantee(Document):
 
 @frappe.whitelist()
 def get_vouchar_detials(column_list, doctype, docname):
+	column_list = json.loads(column_list)
+	for col in column_list:
+		sanitize_searchfield(col) 
 	return frappe.db.sql(''' select {columns} from `tab{doctype}` where name=%s'''
 		.format(columns=", ".join(json.loads(column_list)), doctype=doctype), docname, as_dict=1)[0]

erpnext/accounts/doctype/c_form/c_form.js

@@ -32,10 +32,12 @@ frappe.ui.form.on('C-Form Invoice Detail', {
 	invoice_no(frm, cdt, cdn) {
 		let d = frappe.get_doc(cdt, cdn);
 
-		frm.call('get_invoice_details', {
+		if (d.invoice_no) {
-			invoice_no: d.invoice_no
+			frm.call('get_invoice_details', {
-		}).then(r => {
+				invoice_no: d.invoice_no
-			frappe.model.set_value(cdt, cdn, r.message);
+			}).then(r => {
-		});
+				frappe.model.set_value(cdt, cdn, r.message);
+			});
+		}
 	}
 });

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -124,11 +124,13 @@
  ],
  "icon": "fa fa-money",
  "idx": 1,
+ "is_tree": 1,
  "links": [],
- "modified": "2020-01-28 13:50:23.430434",
+ "modified": "2020-03-18 17:59:04.321637",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center",
+ "nsm_parent_field": "parent_cost_center",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -233,35 +233,14 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
 			frappe.throw(_("Outstanding for {0} cannot be less than zero ({1})").format(against_voucher, fmt_money(bal)))
 
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
-		update_outstanding_amt_in_ref(against_voucher, against_voucher_type, bal)
-
-def update_outstanding_amt_in_ref(against_voucher, against_voucher_type, bal):
-	data = []
-	# Update outstanding amt on against voucher
-	if against_voucher_type == "Fees":
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
-		ref_doc.db_set('outstanding_amount', bal)
-		ref_doc.set_status(update=True)
-		return
-	elif against_voucher_type == "Purchase Invoice":
-		from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_status
-		data = frappe.db.get_value(against_voucher_type, against_voucher, 
-			["name as purchase_invoice", "outstanding_amount", 
-			"is_return", "due_date", "docstatus"])
-	elif against_voucher_type == "Sales Invoice":
-		from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_status
-		data = frappe.db.get_value(against_voucher_type, against_voucher, 
-			["name as sales_invoice", "outstanding_amount", "is_discounted", 
-			"is_return", "due_date", "docstatus"])
 
-	precision = frappe.get_precision(against_voucher_type, "outstanding_amount")
+		# Didn't use db_set for optimisation purpose
-	data = list(data)
+		ref_doc.outstanding_amount = bal
-	data.append(precision)
+		frappe.db.set_value(against_voucher_type, against_voucher, 'outstanding_amount', bal)
-	status = get_status(data)
+
-	frappe.db.set_value(against_voucher_type, against_voucher, {
+		ref_doc.set_status(update=True)
-		'outstanding_amount': bal,
+
-		'status': status
-	})
 
 def validate_frozen_account(account, adv_adj=None):
 	frozen_account = frappe.db.get_value("Account", account, "freeze_account")

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -38,6 +38,7 @@ class TestGLEntry(unittest.TestCase):
 			filters={"voucher_type": "Journal Entry", "voucher_no": je.name},
 			order_by="creation"
 		)
+
 		self.assertTrue(all(entry.to_rename == 1 for entry in gl_entries))
 		old_naming_series_current_value = frappe.db.sql("SELECT current from tabSeries where name = %s", naming_series)[0][0]
 

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -454,8 +454,10 @@ class JournalEntry(AccountsController):
 	def set_print_format_fields(self):
 		bank_amount = party_amount = total_amount = 0.0
 		currency = bank_account_currency = party_account_currency = pay_to_recd_from= None
+		party_type = None
 		for d in self.get('accounts'):
 			if d.party_type in ['Customer', 'Supplier'] and d.party:
+				party_type = d.party_type
 				if not pay_to_recd_from:
 					pay_to_recd_from = d.party
 
@@ -467,9 +469,9 @@ class JournalEntry(AccountsController):
 				bank_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
 				bank_account_currency = d.account_currency
 
-		if pay_to_recd_from:
+		if party_type and pay_to_recd_from:
-			self.pay_to_recd_from = frappe.db.get_value(d.party_type, pay_to_recd_from,
+			self.pay_to_recd_from = frappe.db.get_value(party_type, pay_to_recd_from,
-				"customer_name" if d.party_type=="Customer" else "supplier_name")
+				"customer_name" if party_type=="Customer" else "supplier_name")
 			if bank_amount:
 				total_amount = bank_amount
 				currency = bank_account_currency

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -161,15 +161,15 @@ class TestPaymentEntry(unittest.TestCase):
 		pe.insert()
 		pe.submit()
 
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
+		outstanding_amount, status = frappe.db.get_value("Sales Invoice", si.name, ["outstanding_amount", "status"])
-		self.assertEqual(outstanding_amount, 0)
+		self.assertEqual(flt(outstanding_amount), 0)
-		self.assertEqual(si.status, 'Paid')
+		self.assertEqual(status, 'Paid')
 
 		pe.cancel()
 
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
+		outstanding_amount, status = frappe.db.get_value("Sales Invoice", si.name, ["outstanding_amount", "status"])
-		self.assertEqual(outstanding_amount, 100)
+		self.assertEqual(flt(outstanding_amount), 100)
-		self.assertEqual(si.status, 'Unpaid')
+		self.assertEqual(status, 'Unpaid')
 
 	def test_payment_against_purchase_invoice_to_check_status(self):
 		pi = make_purchase_invoice(supplier="_Test Supplier USD", debit_to="_Test Payable USD - _TC",
@@ -182,15 +182,15 @@ class TestPaymentEntry(unittest.TestCase):
 		pe.insert()
 		pe.submit()
 
-		outstanding_amount = flt(frappe.db.get_value("Purchase Invoice", pi.name, "outstanding_amount"))
+		outstanding_amount, status = frappe.db.get_value("Purchase Invoice", pi.name, ["outstanding_amount", "status"])
-		self.assertEqual(outstanding_amount, 0)
+		self.assertEqual(flt(outstanding_amount), 0)
-		self.assertEqual(pi.status, 'Paid')
+		self.assertEqual(status, 'Paid')
 
 		pe.cancel()
 
-		outstanding_amount = flt(frappe.db.get_value("Purchase Invoice", pi.name, "outstanding_amount"))
+		outstanding_amount, status = frappe.db.get_value("Purchase Invoice", pi.name, ["outstanding_amount", "status"])
-		self.assertEqual(outstanding_amount, 100)
+		self.assertEqual(flt(outstanding_amount), 250)
-		self.assertEqual(pi.status, 'Unpaid')
+		self.assertEqual(status, 'Unpaid')
 
 	def test_payment_entry_against_ec(self):
 

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -125,27 +125,6 @@ class PurchaseInvoice(BuyingController):
 			else:
 				self.remarks = _("No Remarks")
 
-	def set_status(self, update=False, status=None, update_modified=True):
-		if self.is_new():
-			if self.get('amended_from'):
-				self.status = 'Draft'
-			return
-
-		if not status:
-			precision = self.precision("outstanding_amount")
-			args = [
-				self.name,
-				self.outstanding_amount,
-				self.is_return,
-				self.due_date,
-				self.docstatus,
-				precision
-			]
-			self.status = get_status(args)
-
-		if update:
-			self.db_set('status', self.status, update_modified = update_modified)
-
 	def set_missing_values(self, for_validate=False):
 		if not self.credit_to:
 			self.credit_to = get_party_account("Supplier", self.supplier, self.company)
@@ -1028,34 +1007,6 @@ class PurchaseInvoice(BuyingController):
 		# calculate totals again after applying TDS
 		self.calculate_taxes_and_totals()
 
-def get_status(*args):
-	purchase_invoice, outstanding_amount, is_return, due_date, docstatus, precision = args[0]
-
-	outstanding_amount = flt(outstanding_amount, precision)
-	due_date = getdate(due_date)
-	now_date = getdate()
-
-	if docstatus == 2:
-		status = "Cancelled"
-	elif docstatus == 1:
-		if outstanding_amount > 0 and due_date < now_date:
-			status = "Overdue"
-		elif outstanding_amount > 0 and due_date >= now_date:
-			status = "Unpaid"
-		#Check if outstanding amount is 0 due to debit note issued against invoice
-		elif outstanding_amount <= 0 and is_return == 0 and frappe.db.get_value('Purchase Invoice', {'is_return': 1, 'return_against': purchase_invoice, 'docstatus': 1}):
-			status = "Debit Note Issued"
-		elif is_return == 1:
-			status = "Return"
-		elif outstanding_amount <=0:
-			status = "Paid"
-		else:
-			status = "Submitted"
-	else:
-		status = "Draft"
-
-	return status
-
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
@@ -1116,3 +1067,6 @@ def block_invoice(name, release_date, hold_comment=None):
 def make_inter_company_sales_invoice(source_name, target_doc=None):
 	from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction
 	return make_inter_company_transaction("Purchase Invoice", source_name, target_doc)
+
+def on_doctype_update():
+	frappe.db.add_index("Purchase Invoice", ["supplier", "is_return", "return_against"])

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -777,7 +777,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-03-05 14:20:17.297284",
+ "modified": "2020-03-11 14:20:17.297284",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",

erpnext/accounts/doctype/sales_invoice/pos.py

@@ -423,7 +423,10 @@ def make_invoice(pos_profile, doc_list={}, email_queue_list={}, customers_list={
 				name_list.append(name)
 
 	email_queue = make_email_queue(email_queue_list)
-	pos_profile = json.loads(pos_profile)
+
+	if isinstance(pos_profile, string_types):
+		pos_profile = json.loads(pos_profile)
+
 	customers = get_customers_list(pos_profile)
 	return {
 		'invoice': name_list,

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -1223,18 +1223,38 @@ class SalesInvoice(SellingController):
 				self.status = 'Draft'
 			return
 
+		precision = self.precision("outstanding_amount")
+		outstanding_amount = flt(self.outstanding_amount, precision)
+		due_date = getdate(self.due_date)
+		nowdate = getdate()
+
+		discounting_status = None
+		if self.is_discounted:
+			discountng_status = get_discounting_status(self.name)
+
 		if not status:
-			precision = self.precision("outstanding_amount")
+			if self.docstatus == 2:
-			args = [
+				status = "Cancelled"
-				self.name,
+			elif self.docstatus == 1:
-				self.outstanding_amount,
+				if outstanding_amount > 0 and due_date < nowdate and self.is_discounted and discountng_status=='Disbursed':
-				self.is_discounted,
+					self.status = "Overdue and Discounted"
-				self.is_return,
+				elif outstanding_amount > 0 and due_date < nowdate:
-				self.due_date,
+					self.status = "Overdue"
-				self.docstatus,
+				elif outstanding_amount > 0 and due_date >= nowdate and self.is_discounted and discountng_status=='Disbursed':
-				precision,
+					self.status = "Unpaid and Discounted"
-			]
+				elif outstanding_amount > 0 and due_date >= nowdate:
-			self.status = get_status(args)
+					self.status = "Unpaid"
+				#Check if outstanding amount is 0 due to credit note issued against invoice
+				elif outstanding_amount <= 0 and self.is_return == 0 and frappe.db.get_value('Sales Invoice', {'is_return': 1, 'return_against': self.name, 'docstatus': 1}):
+					self.status = "Credit Note Issued"
+				elif self.is_return == 1:
+					self.status = "Return"
+				elif outstanding_amount<=0:
+					self.status = "Paid"
+				else:
+					self.status = "Submitted"
+			else:
+				self.status = "Draft"
 
 		if update:
 			self.db_set('status', self.status, update_modified = update_modified)
@@ -1259,42 +1279,6 @@ def get_discounting_status(sales_invoice):
 
 	return status
 
-def get_status(*args):
-	sales_invoice, outstanding_amount, is_discounted, is_return, due_date, docstatus, precision = args[0]
-
-	discounting_status = None
-	if is_discounted:
-		discounting_status = get_discounting_status(sales_invoice)
-
-	outstanding_amount = flt(outstanding_amount, precision)
-	due_date = getdate(due_date)
-	now_date = getdate()
-
-	if docstatus == 2:
-		status = "Cancelled"
-	elif docstatus == 1:
-		if outstanding_amount > 0 and due_date < now_date and is_discounted and discounting_status=='Disbursed':
-			status = "Overdue and Discounted"
-		elif outstanding_amount > 0 and due_date < now_date:
-			status = "Overdue"
-		elif outstanding_amount > 0 and due_date >= now_date and is_discounted and discounting_status=='Disbursed':
-			status = "Unpaid and Discounted"
-		elif outstanding_amount > 0 and due_date >= now_date:
-			status = "Unpaid"
-		#Check if outstanding amount is 0 due to credit note issued against invoice
-		elif outstanding_amount <= 0 and is_return == 0 and frappe.db.get_value('Sales Invoice', {'is_return': 1, 'return_against': sales_invoice, 'docstatus': 1}):
-			status = "Credit Note Issued"
-		elif is_return == 1:
-			status = "Return"
-		elif outstanding_amount <=0:
-			status = "Paid"
-		else:
-			status = "Submitted"
-	else:
-		status = "Draft"
-
-	return status
-
 def validate_inter_company_party(doctype, party, company, inter_company_reference):
 	if not party:
 		return

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -786,7 +786,7 @@ class TestSalesInvoice(unittest.TestCase):
 	def test_make_pos_invoice(self):
 		from erpnext.accounts.doctype.sales_invoice.pos import make_invoice
 
-		make_pos_profile()
+		pos_profile = make_pos_profile()
 		pr = make_purchase_receipt(company= "_Test Company with perpetual inventory",supplier_warehouse= "Work In Progress - TCP1", item_code= "_Test FG Item",warehouse= "Stores - TCP1",cost_center= "Main - TCP1")
 		pos = create_sales_invoice(company= "_Test Company with perpetual inventory", debit_to="Debtors - TCP1", item_code= "_Test FG Item", warehouse="Stores - TCP1", income_account = "Sales - TCP1", expense_account = "Cost of Goods Sold - TCP1", cost_center = "Main - TCP1", do_not_save=True)
 
@@ -802,7 +802,7 @@ class TestSalesInvoice(unittest.TestCase):
 			pos.append("taxes", tax)
 
 		invoice_data = [{'09052016142': pos}]
-		si = make_invoice(invoice_data).get('invoice')
+		si = make_invoice(pos_profile, invoice_data).get('invoice')
 		self.assertEqual(si[0], '09052016142')
 
 		sales_invoice = frappe.get_all('Sales Invoice', fields =["*"], filters = {'offline_pos_name': '09052016142', 'docstatus': 1})
@@ -820,7 +820,7 @@ class TestSalesInvoice(unittest.TestCase):
 		if allow_negative_stock:
 			frappe.db.set_value('Stock Settings', None, 'allow_negative_stock', 0)
 
-		make_pos_profile()
+		pos_profile = make_pos_profile()
 		timestamp = cint(time.time())
 
 		item = make_item("_Test POS Item")
@@ -834,7 +834,7 @@ class TestSalesInvoice(unittest.TestCase):
 							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 330}]
 
 		invoice_data = [{timestamp: pos}]
-		si = make_invoice(invoice_data).get('invoice')
+		si = make_invoice(pos_profile, invoice_data).get('invoice')
 		self.assertEqual(si[0], timestamp)
 
 		sales_invoice = frappe.get_all('Sales Invoice', fields =["*"], filters = {'offline_pos_name': timestamp})
@@ -843,7 +843,7 @@ class TestSalesInvoice(unittest.TestCase):
 		timestamp = cint(time.time())
 		pos["offline_pos_name"] = timestamp
 		invoice_data = [{timestamp: pos}]
-		si1 = make_invoice(invoice_data).get('invoice')
+		si1 = make_invoice(pos_profile, invoice_data).get('invoice')
 		self.assertEqual(si1[0], timestamp)
 
 		sales_invoice1 = frappe.get_all('Sales Invoice', fields =["*"], filters = {'offline_pos_name': timestamp})

erpnext/accounts/general_ledger.py

@@ -136,12 +136,11 @@ def save_entries(gl_map, adv_adj, update_outstanding, from_repost=False):
 
 
 def make_entry(args, adv_adj, update_outstanding, from_repost=False):
-	args.update({"doctype": "GL Entry"})
+	gle = frappe.new_doc("GL Entry")
-	gle = frappe.get_doc(args)
+	gle.update(args)
 	gle.flags.ignore_permissions = 1
 	gle.flags.from_repost = from_repost
 	gle.validate()
-	gle.flags.ignore_permissions = True
 	gle.db_insert()
 	gle.run_method("on_update_with_args", adv_adj, update_outstanding, from_repost)
 	gle.flags.ignore_validate = True

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -7,7 +7,7 @@ from frappe import _, scrub
 from frappe.utils import getdate, nowdate, flt, cint, formatdate, cstr, now, time_diff_in_seconds
 from collections import OrderedDict
 from erpnext.accounts.utils import get_currency_precision
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions, get_dimension_with_children
 
 #  This report gives a summary of all Outstanding Invoices considering the following
 
@@ -603,7 +603,6 @@ class ReceivablePayableReport(object):
 			self.add_supplier_filters(conditions, values)
 
 		self.add_accounting_dimensions_filters(conditions, values)
-
 		return " and ".join(conditions), values
 
 	def get_order_by_condition(self):
@@ -666,13 +665,16 @@ class ReceivablePayableReport(object):
 					doctype=doctype, lft=lft, rgt=rgt, key=key)
 
 	def add_accounting_dimensions_filters(self, conditions, values):
-		accounting_dimensions = get_accounting_dimensions()
+		accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 		if accounting_dimensions:
 			for dimension in accounting_dimensions:
-				if self.filters.get(dimension):
+				if self.filters.get(dimension.fieldname):
-					conditions.append("{0} = %s".format(dimension))
+					if frappe.get_cached_value('DocType', dimension.document_type, 'is_tree'):
-					values.append(self.filters.get(dimension))
+						self.filters[dimension.fieldname] = get_dimension_with_children(dimension.document_type,
+							self.filters.get(dimension.fieldname))
+					conditions.append("{0} in %s".format(dimension.fieldname))
+					values.append(tuple(self.filters.get(dimension.fieldname)))
 
 	def get_gle_balance(self, gle):
 		# get the balance of the GL (debit - credit) or reverse balance based on report type

erpnext/accounts/report/financial_statements.py

@@ -16,7 +16,7 @@ from frappe import _
 from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate, cstr)
 
 from six import itervalues
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions, get_dimension_with_children
 
 def get_period_list(from_fiscal_year, to_fiscal_year, periodicity, accumulated_values=False,
 	company=None, reset_period_on_fy_change=True):
@@ -389,7 +389,7 @@ def set_gl_entries_by_account(
 def get_additional_conditions(from_date, ignore_closing_entries, filters):
 	additional_conditions = []
 
-	accounting_dimensions = get_accounting_dimensions()
+	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 	if ignore_closing_entries:
 		additional_conditions.append("ifnull(voucher_type, '')!='Period Closing Voucher'")
@@ -412,11 +412,14 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 			additional_conditions.append("(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)")
 		else:
 			additional_conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
-		
+
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:
-			if filters.get(dimension):
+			if filters.get(dimension.fieldname):
-				additional_conditions.append("{0} in (%({0})s)".format(dimension))
+				if frappe.get_cached_value('DocType', dimension.document_type, 'is_tree'):
+					filters[dimension.fieldname] = get_dimension_with_children(dimension.document_type,
+						filters.get(dimension.fieldname))
+				additional_conditions.append("{0} in %({0})s".format(dimension.fieldname))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/general_ledger/general_ledger.html

@@ -2,7 +2,7 @@
 <h4 class="text-center">
 	{% if (filters.party_name) { %}
 		{%= filters.party_name %}
-	{% } else if (filters.party && filters.show_name) { %}
+	{% } else if (filters.party) { %}
 		{%= filters.party %}
 	{% } else if (filters.account) { %}
 		{%= filters.account %}

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -10,7 +10,7 @@ from frappe import _, _dict
 from erpnext.accounts.utils import get_account_currency
 from erpnext.accounts.report.financial_statements import get_cost_centers_with_children
 from six import iteritems
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions, get_dimension_with_children
 from collections import OrderedDict
 
 def execute(filters=None):
@@ -194,12 +194,15 @@ def get_conditions(filters):
 	if match_conditions:
 		conditions.append(match_conditions)
 
-	accounting_dimensions = get_accounting_dimensions()
+	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:
-			if filters.get(dimension):
+			if filters.get(dimension.fieldname):
-				conditions.append("{0} in (%({0})s)".format(dimension))
+				if frappe.get_cached_value('DocType', dimension.document_type, 'is_tree'):
+					filters[dimension.fieldname] = get_dimension_with_children(dimension.document_type,
+						filters.get(dimension.fieldname))
+				conditions.append("{0} in %({0})s".format(dimension.fieldname))
 
 	return "and {}".format(" and ".join(conditions)) if conditions else ""
 

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -201,7 +201,8 @@ def get_columns(additional_table_columns, filters):
 		{
 			'label': _('Mode Of Payment'),
 			'fieldname': 'mode_of_payment',
-			'fieldtype': 'Data',
+			'fieldtype': 'Link',
+			'options': 'Mode of Payment',
 			'width': 120
 		},
 		{
@@ -309,6 +310,8 @@ def get_items(filters, additional_query_columns):
 
 	if additional_query_columns:
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
+	else:
+		additional_query_columns = ''
 
 	return frappe.db.sql("""
 		select
@@ -320,7 +323,7 @@ def get_items(filters, additional_query_columns):
 			`tabPurchase Invoice Item`.`purchase_receipt`, `tabPurchase Invoice Item`.`po_detail`,
 			`tabPurchase Invoice Item`.`expense_account`, `tabPurchase Invoice Item`.`stock_qty`,
 			`tabPurchase Invoice Item`.`stock_uom`, `tabPurchase Invoice Item`.`base_net_amount`,
-			`tabPurchase Invoice`.supplier_name, `tabPurchase Invoice`.mode_of_payment {0}
+			`tabPurchase Invoice`.`supplier_name`, `tabPurchase Invoice`.`mode_of_payment` {0}
 		from `tabPurchase Invoice`, `tabPurchase Invoice Item`
 		where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
 		`tabPurchase Invoice`.docstatus = 1 %s

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -373,6 +373,8 @@ def get_items(filters, additional_query_columns):
 
 	if additional_query_columns:
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
+	else:
+		additional_query_columns = ''
 
 	return frappe.db.sql("""
 		select

erpnext/accounts/report/sales_register/sales_register.py

@@ -6,7 +6,7 @@ import frappe
 from frappe.utils import flt
 from frappe import msgprint, _
 from frappe.model.meta import get_field_precision
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions, get_dimension_with_children
 
 def execute(filters=None):
 	return _execute(filters)
@@ -341,14 +341,18 @@ def get_conditions(filters):
 			 where parent=`tabSales Invoice`.name
 			 	and ifnull(`tabSales Invoice Item`.item_group, '') = %(item_group)s)"""
 
-	accounting_dimensions = get_accounting_dimensions()
+	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:
-			if filters.get(dimension):
+			if filters.get(dimension.fieldname):
+				if frappe.get_cached_value('DocType', dimension.document_type, 'is_tree'):
+					filters[dimension.fieldname] = get_dimension_with_children(dimension.document_type,
+						filters.get(dimension.fieldname))
+
 				conditions += """ and exists(select name from `tabSales Invoice Item`
 					where parent=`tabSales Invoice`.name
-						and ifnull(`tabSales Invoice Item`.{0}, '') = %({0})s)""".format(dimension)
+						and ifnull(`tabSales Invoice Item`.{0}, '') in %({0})s)""".format(dimension.fieldname)
 
 
 	return conditions

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -7,7 +7,7 @@ from frappe import _
 from frappe.utils import flt, getdate, formatdate, cstr
 from erpnext.accounts.report.financial_statements \
 	import filter_accounts, set_gl_entries_by_account, filter_out_zero_value_rows
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions, get_dimension_with_children
 
 value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit")
 
@@ -109,7 +109,7 @@ def get_rootwise_opening_balances(filters, report_type):
 
 		additional_conditions += fb_conditions
 
-	accounting_dimensions = get_accounting_dimensions()
+	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 	query_filters = {
 		"company": filters.company,
@@ -122,11 +122,14 @@ def get_rootwise_opening_balances(filters, report_type):
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:
-			if filters.get(dimension):
+			if filters.get(dimension.fieldname):
-				additional_conditions += """ and {0} in (%({0})s) """.format(dimension)
+				if frappe.get_cached_value('DocType', dimension.document_type, 'is_tree'):
+					filters[dimension.fieldname] = get_dimension_with_children(dimension.document_type,
+						filters.get(dimension.fieldname))
+				additional_conditions += "and {0} in %({0})s".format(dimension.fieldname)
 
 				query_filters.update({
-					dimension: filters.get(dimension)
+					dimension.fieldname: filters.get(dimension.fieldname)
 				})
 
 	gle = frappe.db.sql("""

erpnext/assets/doctype/location/location.json

@@ -139,12 +139,14 @@
    "read_only": 1
   }
  ],
+ "is_tree": 1,
  "links": [],
- "modified": "2020-03-02 19:34:28.362267",
+ "modified": "2020-03-18 18:00:08.885805",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Location",
  "name_case": "Title Case",
+ "nsm_parent_field": "parent_location",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/controllers/status_updater.py

@@ -69,6 +69,17 @@ status_map = {
 		["Cancelled", "eval:self.docstatus==2"],
 		["Closed", "eval:self.status=='Closed'"],
 	],
+	"Purchase Invoice": [	
+		["Draft", None],	
+		["Submitted", "eval:self.docstatus==1"],	
+		["Paid", "eval:self.outstanding_amount==0 and self.docstatus==1"],	
+		["Return", "eval:self.is_return==1 and self.docstatus==1"],	
+		["Debit Note Issued",	
+			"eval:self.outstanding_amount <= 0 and self.docstatus==1 and self.is_return==0 and get_value('Purchase Invoice', {'is_return': 1, 'return_against': self.name, 'docstatus': 1})"],	
+		["Unpaid", "eval:self.outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()) and self.docstatus==1"],	
+		["Overdue", "eval:self.outstanding_amount > 0 and getdate(self.due_date) < getdate(nowdate()) and self.docstatus==1"],	
+		["Cancelled", "eval:self.docstatus==2"],	
+	],
 	"Material Request": [
 		["Draft", None],
 		["Stopped", "eval:self.status == 'Stopped'"],

erpnext/controllers/stock_controller.py

@@ -238,7 +238,7 @@ class StockController(AccountsController):
 		for d in self.items:
 			if not d.batch_no: continue
 
-			serial_nos = [d.name for d in frappe.get_all("Serial No", {'batch_no': d.batch_no})]
+			serial_nos = [sr.name for sr in frappe.get_all("Serial No", {'batch_no': d.batch_no})]
 			if serial_nos:
 				frappe.db.set_value("Serial No", { 'name': ['in', serial_nos] }, "batch_no", None)
 

erpnext/crm/doctype/opportunity/opportunity.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "naming_series:",
@@ -214,7 +215,8 @@
   {
    "fieldname": "opportunity_amount",
    "fieldtype": "Currency",
-   "label": "Opportunity Amount"
+   "label": "Opportunity Amount",
+   "options": "currency"
   },
   {
    "default": "0",
@@ -418,7 +420,8 @@
  ],
  "icon": "fa fa-info-sign",
  "idx": 195,
- "modified": "2019-09-30 12:58:37.385400",
+ "links": [],
+ "modified": "2020-03-20 12:28:45.228994",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity",

erpnext/education/doctype/assessment_group/assessment_group.json

@@ -1,274 +1,90 @@
 {
- "allow_copy": 0, 
+ "actions": [],
- "allow_guest_to_view": 0, 
+ "allow_import": 1,
- "allow_import": 1, 
+ "allow_rename": 1,
- "allow_rename": 1, 
+ "autoname": "field:assessment_group_name",
- "autoname": "field:assessment_group_name", 
+ "creation": "2016-08-04 04:42:48.319388",
- "beta": 0, 
+ "doctype": "DocType",
- "creation": "2016-08-04 04:42:48.319388", 
+ "editable_grid": 1,
- "custom": 0, 
+ "field_order": [
- "docstatus": 0, 
+  "assessment_group_name",
- "doctype": "DocType", 
+  "is_group",
- "document_type": "", 
+  "section_break_2",
- "editable_grid": 1, 
+  "parent_assessment_group",
+  "lft",
+  "rgt",
+  "old_parent"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
+   "fieldname": "assessment_group_name",
-   "allow_on_submit": 0, 
+   "fieldtype": "Data",
-   "bold": 0, 
+   "in_list_view": 1,
-   "collapsible": 0, 
+   "label": "Assessment Group Name",
-   "columns": 0, 
+   "reqd": 1,
-   "fieldname": "assessment_group_name", 
+   "unique": 1
-   "fieldtype": "Data", 
+  },
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Group Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_bulk_edit": 0, 
+   "default": "0",
-   "allow_on_submit": 0, 
+   "fieldname": "is_group",
-   "bold": 0, 
+   "fieldtype": "Check",
-   "collapsible": 0, 
+   "label": "Is Group"
-   "columns": 0, 
+  },
-   "fieldname": "is_group", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_bulk_edit": 0, 
+   "fieldname": "section_break_2",
-   "allow_on_submit": 0, 
+   "fieldtype": "Section Break",
-   "bold": 0, 
+   "hidden": 1
-   "collapsible": 0, 
+  },
-   "columns": 0, 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_bulk_edit": 0, 
+   "fieldname": "parent_assessment_group",
-   "allow_on_submit": 0, 
+   "fieldtype": "Link",
-   "bold": 0, 
+   "in_list_view": 1,
-   "collapsible": 0, 
+   "label": "Parent Assessment Group",
-   "columns": 0, 
+   "options": "Assessment Group",
-   "fieldname": "parent_assessment_group", 
+   "reqd": 1
-   "fieldtype": "Link", 
+  },
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Parent Assessment Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_bulk_edit": 0, 
+   "fieldname": "lft",
-   "allow_on_submit": 0, 
+   "fieldtype": "Int",
-   "bold": 0, 
+   "label": "lft"
-   "collapsible": 0, 
+  },
-   "columns": 0, 
-   "fieldname": "lft", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "lft", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_bulk_edit": 0, 
+   "fieldname": "rgt",
-   "allow_on_submit": 0, 
+   "fieldtype": "Int",
-   "bold": 0, 
+   "label": "rgt"
-   "collapsible": 0, 
+  },
-   "columns": 0, 
-   "fieldname": "rgt", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "rgt", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_bulk_edit": 0, 
+   "fieldname": "old_parent",
-   "allow_on_submit": 0, 
+   "fieldtype": "Link",
-   "bold": 0, 
+   "ignore_user_permissions": 1,
-   "collapsible": 0, 
+   "label": "old_parent",
-   "columns": 0, 
+   "options": "Assessment Group"
-   "fieldname": "old_parent", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "old_parent", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
- ], 
+ ],
- "has_web_view": 0, 
+ "is_tree": 1,
- "hide_heading": 0, 
+ "links": [],
- "hide_toolbar": 0, 
+ "modified": "2020-03-18 18:01:14.710416",
- "idx": 0, 
+ "modified_by": "Administrator",
- "image_view": 0, 
+ "module": "Education",
- "in_create": 0, 
+ "name": "Assessment Group",
- "is_submittable": 0, 
+ "nsm_parent_field": "parent_assessment_group",
- "issingle": 0, 
+ "owner": "Administrator",
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-10 19:09:25.366400", 
- "modified_by": "Administrator", 
- "module": "Education", 
- "name": "Assessment Group", 
- "name_case": "", 
- "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0, 
+   "create": 1,
-   "apply_user_permissions": 0, 
+   "delete": 1,
-   "cancel": 0, 
+   "email": 1,
-   "create": 1, 
+   "export": 1,
-   "delete": 1, 
+   "print": 1,
-   "email": 1, 
+   "read": 1,
-   "export": 1, 
+   "report": 1,
-   "if_owner": 0, 
+   "role": "Academics User",
-   "import": 0, 
+   "share": 1,
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
    "write": 1
   }
- ], 
+ ],
- "quick_entry": 1, 
+ "quick_entry": 1,
- "read_only": 0, 
+ "restrict_to_domain": "Education",
- "read_only_onload": 0, 
+ "sort_field": "modified",
- "restrict_to_domain": "Education", 
+ "sort_order": "DESC"
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
 }

erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json

@@ -9,7 +9,6 @@
  "doctype": "DocType",
  "document_type": "Setup",
  "editable_grid": 1,
- "engine": "InnoDB",
  "field_order": [
   "healthcare_service_unit_name",
   "parent_healthcare_service_unit",
@@ -104,6 +103,10 @@
    "options": "Vacant\nOccupied",
    "read_only": 1
   },
+  {
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break"
+  },
   {
    "bold": 1,
    "depends_on": "eval:doc.is_group != 1",
@@ -153,17 +156,15 @@
    "options": "Healthcare Service Unit",
    "print_hide": 1,
    "report_hide": 1
-  },
-  {
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break"
   }
  ],
+ "is_tree": 1,
  "links": [],
  "modified": "2020-01-30 18:03:29.031351",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Healthcare Service Unit",
+ "nsm_parent_field": "parent_healthcare_service_unit",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/healthcare/doctype/patient_appointment/patient_appointment.py

@@ -415,4 +415,4 @@ def update_appointment_status():
 	}, as_dict=1)
 
 	for appointment in appointments:
-		frappe.get_doc('Patient Appointment', appointment.name).set_status()
+		frappe.get_doc('Patient Appointment', appointment.name).set_status()

erpnext/hr/doctype/department/department.json

@@ -129,11 +129,13 @@
  ],
  "icon": "fa fa-sitemap",
  "idx": 1,
+ "is_tree": 1,
  "links": [],
- "modified": "2019-12-12 14:48:35.254308",
+ "modified": "2020-03-18 18:03:27.784362",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Department",
+ "nsm_parent_field": "parent_department",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/hr/doctype/department/department.py

@@ -48,12 +48,17 @@ def get_abbreviated_name(name, company):
 @frappe.whitelist()
 def get_children(doctype, parent=None, company=None, is_root=False):
 	condition = ''
+	var_dict = {
+		"name": get_root_of("Department"),
+		"parent": parent,
+		"company": company,
+	}
 	if company == parent:
-		condition = "name='{0}'".format(get_root_of("Department"))
+		condition = "name=%(name)s"
 	elif company:
-		condition = "parent_department='{0}' and company='{1}'".format(parent, company)
+		condition = "parent_department=%(parent)s and company=%(company)s"
 	else:
-		condition = "parent_department = '{0}'".format(parent)
+		condition = "parent_department = %(parent)s"
 
 	return frappe.db.sql("""
 		select
@@ -62,7 +67,7 @@ def get_children(doctype, parent=None, company=None, is_root=False):
 		from `tab{doctype}`
 		where
 			{condition}
-		order by name""".format(doctype=doctype, condition=condition), as_dict=1)
+		order by name""".format(doctype=doctype, condition=condition), var_dict, as_dict=1)
 
 @frappe.whitelist()
 def add_node():

erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py

@@ -190,6 +190,7 @@ def get_benefit_component_amount(employee, start_date, end_date, salary_componen
 	component_max_benefit, depends_on_payment_days = frappe.db.get_value("Salary Component",
 		salary_component, ["max_benefit_amount", "depends_on_payment_days"])
 
+	benefit_amount = 0
 	if benefit_application:
 		benefit_amount = frappe.db.get_value("Employee Benefit Application Detail",
 			{"parent": benefit_application[0][0], "earning_component": salary_component}, "amount")

erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json

@@ -71,7 +71,7 @@
    "label": "Amount",
    "oldfieldname": "tax_amount",
    "oldfieldtype": "Currency",
-   "options": "currency"
+   "options": "Company:company:default_currency"
   },
   {
    "columns": 2,
@@ -81,7 +81,7 @@
    "label": "Total",
    "oldfieldname": "total",
    "oldfieldtype": "Currency",
-   "options": "currency",
+   "options": "Company:company:default_currency",
    "read_only": 1
   },
   {
@@ -95,7 +95,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2019-12-11 13:50:02.883328",
+ "modified": "2020-03-11 13:25:06.721917",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Expense Taxes and Charges",

erpnext/hr/doctype/vehicle_log/test_vehicle_log.py

@@ -6,11 +6,14 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 from frappe.utils import nowdate,flt, cstr,random_string
-# test_records = frappe.get_test_records('Vehicle Log')
+
 class TestVehicleLog(unittest.TestCase):
 	def test_make_vehicle_log_and_syncing_of_odometer_value(self):
-		employee_id=frappe.db.sql("""select name from `tabEmployee` order by modified desc limit 1""")[0][0]
+		employee_id = frappe.db.sql("""select name from `tabEmployee` where status='Active' order by modified desc limit 1""")
+		employee_id = employee_id[0][0] if employee_id else None
+
 		license_plate = get_vehicle(employee_id)
+
 		vehicle_log = frappe.get_doc({
 			"doctype": "Vehicle Log",
 			"license_plate": cstr(license_plate),

erpnext/hr/doctype/vehicle_log/vehicle_log.js

@@ -3,11 +3,6 @@
 
 frappe.ui.form.on("Vehicle Log", {
 	refresh: function(frm) {
-
-		if(frm.doc.license_plate && frm.doc.__islocal){
-			frm.events.set_vehicle_details(frm);
-		}
-
 		if(frm.doc.docstatus == 1) {
 			frm.add_custom_button(__('Expense Claim'), function() {
 				frm.events.expense_claim(frm);
@@ -16,27 +11,6 @@ frappe.ui.form.on("Vehicle Log", {
 		}
 	},
 
-	license_plate: function(frm) {
-		if(frm.doc.license_plate){
-			frm.events.set_vehicle_details(frm);
-		}
-	},
-
-	set_vehicle_details: function(frm) {
-		frappe.call({
-			method: "erpnext.hr.doctype.vehicle_log.vehicle_log.get_make_model",
-			args: {
-				license_plate: frm.doc.license_plate
-			},
-			callback: function(r) {
-				frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "make", r.message[0]);
-				frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "model", r.message[1]);
-				frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "last_odometer", r.message[2]);
-				frappe.model.set_value(cur_frm.doctype, cur_frm.docname, "employee", r.message[3]);
-			}
-		});
-	},
-
 	expense_claim: function(frm){
 		frappe.call({
 			method: "erpnext.hr.doctype.vehicle_log.vehicle_log.make_expense_claim",

erpnext/hr/doctype/vehicle_log/vehicle_log.json

@@ -1,5 +1,4 @@
 {
- "actions": [],
  "autoname": "naming_series:",
  "creation": "2016-09-03 14:14:51.788550",
  "doctype": "DocType",
@@ -56,6 +55,8 @@
    "reqd": 1
   },
   {
+   "fetch_from": "license_plate.employee",
+   "fetch_if_empty": 1,
    "fieldname": "employee",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -73,11 +74,13 @@
    "fieldtype": "Column Break"
   },
   {
+   "fetch_from": "license_plate.model",
    "fieldname": "model",
    "fieldtype": "Read Only",
    "label": "Model"
   },
   {
+   "fetch_from": "license_plate.make",
    "fieldname": "make",
    "fieldtype": "Read Only",
    "label": "Make"
@@ -152,6 +155,7 @@
    "read_only": 1
   },
   {
+   "fetch_from": "license_plate.last_odometer",
    "fieldname": "last_odometer",
    "fieldtype": "Int",
    "label": "last Odometer Value ",
@@ -164,8 +168,7 @@
   }
  ],
  "is_submittable": 1,
- "links": [],
+ "modified": "2020-03-18 16:45:45.060761",
- "modified": "2020-01-28 12:43:34.419647",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Vehicle Log",

erpnext/hr/doctype/vehicle_log/vehicle_log.py

@@ -12,18 +12,7 @@ from frappe.model.document import Document
 class VehicleLog(Document):
 	def validate(self):
 		if flt(self.odometer) < flt(self.last_odometer):
-			frappe.throw(_("Current Odometer reading entered should be greater than initial Vehicle Odometer {0}").format(self.last_odometer))
+			frappe.throw(_("Current Odometer Value should be greater than Last Odometer Value {0}").format(self.last_odometer))
-		for service_detail in self.service_detail:
-			if (service_detail.service_item or service_detail.type or service_detail.frequency or service_detail.expense_amount):
-					if not (service_detail.service_item and service_detail.type and service_detail.frequency and service_detail.expense_amount):
-							frappe.throw(_("Service Item,Type,frequency and expense amount are required"))
-
-	def before_insert(self):
-		model_details = get_make_model(self.license_plate)
-		self.make = model_details[0]
-		self.model = model_details[1]
-		self.last_odometer = model_details[2]
-		self.employee = model_details[3]
 
 	def on_submit(self):
 		frappe.db.set_value("Vehicle", self.license_plate, "last_odometer", self.odometer)
@@ -34,35 +23,26 @@ class VehicleLog(Document):
 			updated_odometer_value = int(frappe.db.get_value("Vehicle", self.license_plate, "last_odometer")) - distance_travelled
 			frappe.db.set_value("Vehicle", self.license_plate, "last_odometer", updated_odometer_value)
 
-@frappe.whitelist()
-def get_make_model(license_plate):
-	vehicle=frappe.get_doc("Vehicle",license_plate)
-	return (vehicle.make, vehicle.model, vehicle.last_odometer, vehicle.employee)
-
 @frappe.whitelist()
 def make_expense_claim(docname):
-	def check_exp_claim_exists():
+	expense_claim = frappe.db.exists("Expense Claim", {"vehicle_log": docname})
-		exp_claim = frappe.db.sql("""select name from `tabExpense Claim` where vehicle_log=%s""",vehicle_log.name)
+	if expense_claim:
-		return exp_claim[0][0] if exp_claim else ""
+		frappe.throw(_("Expense Claim {0} already exists for the Vehicle Log").format(expense_claim))
-	def calc_service_exp():
-		total_exp_amt=0
-		exp_claim = check_exp_claim_exists()
-		if exp_claim:
-			frappe.throw(_("Expense Claim {0} already exists for the Vehicle Log").format(exp_claim))
-		for serdetail in vehicle_log.service_detail:
-			total_exp_amt = total_exp_amt + serdetail.expense_amount
-		return total_exp_amt
 
 	vehicle_log = frappe.get_doc("Vehicle Log", docname)
+	service_expense = sum([flt(d.expense_amount) for d in vehicle_log.service_detail])
+
+	claim_amount = service_expense + flt(vehicle_log.price)
+	if not claim_amount:
+		frappe.throw(_("No additional expenses has been added"))
+
 	exp_claim = frappe.new_doc("Expense Claim")
-	exp_claim.employee=vehicle_log.employee
+	exp_claim.employee = vehicle_log.employee
-	exp_claim.vehicle_log=vehicle_log.name
+	exp_claim.vehicle_log = vehicle_log.name
-	exp_claim.remark=_("Expense Claim for Vehicle Log {0}").format(vehicle_log.name)
+	exp_claim.remark = _("Expense Claim for Vehicle Log {0}").format(vehicle_log.name)
-	fuel_price=vehicle_log.price
+	exp_claim.append("expenses", {
-	total_claim_amt=calc_service_exp() + fuel_price
+		"expense_date": vehicle_log.date,
-	exp_claim.append("expenses",{
+		"description": _("Vehicle Expenses"),
-		"expense_date":vehicle_log.date,
+		"amount": claim_amount
-		"description":_("Vehicle Expenses"),
-		"amount":total_claim_amt
 	})
 	return exp_claim.as_dict()

erpnext/hr/doctype/vehicle_service/vehicle_service.json

@@ -1,153 +1,57 @@
 {
- "allow_copy": 0, 
+ "creation": "2016-09-03 19:20:14.561962",
- "allow_import": 0, 
+ "doctype": "DocType",
- "allow_rename": 0, 
+ "document_type": "Document",
- "beta": 0, 
+ "editable_grid": 1,
- "creation": "2016-09-03 19:20:14.561962", 
+ "engine": "InnoDB",
- "custom": 0, 
+ "field_order": [
- "docstatus": 0, 
+  "service_item",
- "doctype": "DocType", 
+  "type",
- "document_type": "Document", 
+  "frequency",
- "editable_grid": 1, 
+  "expense_amount"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
+   "fieldname": "service_item",
-   "bold": 0, 
+   "fieldtype": "Select",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Service Item",
-   "fieldname": "service_item", 
+   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels",
-   "fieldtype": "Select", 
+   "reqd": 1
-   "hidden": 0, 
+  },
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Service Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels", 
-   "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, 
+   "fieldname": "type",
-   "bold": 0, 
+   "fieldtype": "Select",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Type",
-   "fieldname": "type", 
+   "options": "\nInspection\nService\nChange",
-   "fieldtype": "Select", 
+   "reqd": 1
-   "hidden": 0, 
+  },
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nInspection\nService\nChange", 
-   "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, 
+   "fieldname": "frequency",
-   "bold": 0, 
+   "fieldtype": "Select",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Frequency",
-   "fieldname": "frequency", 
+   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly",
-   "fieldtype": "Select", 
+   "reqd": 1
-   "hidden": 0, 
+  },
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly", 
-   "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, 
+   "fieldname": "expense_amount",
-   "bold": 0, 
+   "fieldtype": "Currency",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Expense",
-   "fieldname": "expense_amount", 
+   "reqd": 1
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Expense", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
- ], 
+ ],
- "hide_heading": 0, 
+ "istable": 1,
- "hide_toolbar": 0, 
+ "modified": "2020-03-18 16:49:46.645004",
- "idx": 0, 
+ "modified_by": "Administrator",
- "image_view": 0, 
+ "module": "HR",
- "in_create": 0, 
+ "name": "Vehicle Service",
-
+ "owner": "Administrator",
- "is_submittable": 0, 
+ "permissions": [],
- "issingle": 0, 
+ "quick_entry": 1,
- "istable": 1, 
+ "sort_field": "modified",
- "max_attachments": 0, 
+ "sort_order": "DESC",
- "modified": "2017-01-09 11:10:29.476907", 
+ "track_changes": 1
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Vehicle Service", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
 }

erpnext/loan_management/doctype/loan/test_loan.py

@@ -294,18 +294,21 @@ class TestLoan(unittest.TestCase):
 
 		make_loan_disbursement_entry(loan.name, loan.loan_amount)
 
-		frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = %s
+		frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = 100
-		where loan_security=%s""", (100, 'Test Security 2'))
+			where loan_security='Test Security 2'""")
 
 		check_for_ltv_shortfall()
 		loan_security_shortfall = frappe.get_doc("Loan Security Shortfall", {"loan": loan.name})
-
 		self.assertTrue(loan_security_shortfall)
 
 		self.assertEquals(loan_security_shortfall.loan_amount, 1000000.00)
 		self.assertEquals(loan_security_shortfall.security_value, 400000.00)
 		self.assertEquals(loan_security_shortfall.shortfall_amount, 600000.00)
 
+		frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = 250
+			where loan_security='Test Security 2'""")
+
+
 def create_loan_accounts():
 	if not frappe.db.exists("Account", "Loans and Advances (Assets) - _TC"):
 		frappe.get_doc({
@@ -399,7 +402,8 @@ def create_loan_security_type():
 			"doctype": "Loan Security Type",
 			"loan_security_type": "Stock",
 			"unit_of_measure": "Nos",
-			"haircut": 50.00
+			"haircut": 50.00,
+			"loan_to_value_ratio": 50
 		}).insert(ignore_permissions=True)
 
 def create_loan_security():

erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py

@@ -130,9 +130,10 @@ def make_accrual_interest_entry_for_term_loans(posting_date=None):
 			loan.loan_account, loan.principal_amount + loan.balance_loan_amount, loan.interest_amount,
 			payable_principal = loan.principal_amount , posting_date=posting_date)
 
-	frappe.db.sql("""UPDATE `tabRepayment Schedule`
+	if accrued_entries:
-		SET is_accrued = 1 where name in (%s)""" #nosec
+		frappe.db.sql("""UPDATE `tabRepayment Schedule`
-		% ", ".join(['%s']*len(accrued_entries)), tuple(accrued_entries))
+			SET is_accrued = 1 where name in (%s)""" #nosec
+			% ", ".join(['%s']*len(accrued_entries)), tuple(accrued_entries))
 
 def make_loan_interest_accrual_entry(loan, applicant_type, applicant, interest_income_account, loan_account,
 	pending_principal_amount, interest_amount, payable_principal=None, process_loan_interest=None, posting_date=None):

erpnext/manufacturing/doctype/bom/bom.py

@@ -498,6 +498,14 @@ class BOM(WebsiteGenerator):
 		self.scrap_material_cost = total_sm_cost
 		self.base_scrap_material_cost = base_total_sm_cost
 
+	def update_new_bom(self, old_bom, new_bom, rate):
+		for d in self.get("items"):
+			if d.bom_no != old_bom: continue
+
+			d.bom_no = new_bom
+			d.rate = rate
+			d.amount = (d.stock_qty or d.qty) * rate
+
 	def update_exploded_items(self):
 		""" Update Flat BOM, following will be correct data"""
 		self.get_exploded_items()
@@ -827,6 +835,10 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None):
 def get_bom_diff(bom1, bom2):
 	from frappe.model import table_fields
 
+	if bom1 == bom2:
+		frappe.throw(_("BOM 1 {0} and BOM 2 {1} should not be same")
+			.format(frappe.bold(bom1), frappe.bold(bom2)))
+
 	doc1 = frappe.get_doc('BOM', bom1)
 	doc2 = frappe.get_doc('BOM', bom2)
 

erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py

@@ -14,10 +14,13 @@ import click
 class BOMUpdateTool(Document):
 	def replace_bom(self):
 		self.validate_bom()
-		self.update_new_bom()
+
+		unit_cost = get_new_bom_unit_cost(self.new_bom)
+		self.update_new_bom(unit_cost)
+
 		frappe.cache().delete_key('bom_children')
 		bom_list = self.get_parent_boms(self.new_bom)
-		updated_bom = []
+
 		with click.progressbar(bom_list) as bom_list:
 			pass
 		for bom in bom_list:
@@ -26,7 +29,9 @@ class BOMUpdateTool(Document):
 				# this is only used for versioning and we do not want
 				# to make separate db calls by using load_doc_before_save
 				# which proves to be expensive while doing bulk replace
-				bom_obj._doc_before_save = bom_obj.as_dict()
+				bom_obj._doc_before_save = bom_obj
+				bom_obj.update_new_bom(self.current_bom, self.new_bom, unit_cost)
+				bom_obj.update_exploded_items()
 				bom_obj.calculate_cost()
 				bom_obj.update_parent_cost()
 				bom_obj.db_update()
@@ -43,14 +48,10 @@ class BOMUpdateTool(Document):
 			!= frappe.db.get_value("BOM", self.new_bom, "item"):
 				frappe.throw(_("The selected BOMs are not for the same item"))
 
-	def update_new_bom(self):
+	def update_new_bom(self, unit_cost):
-		new_bom_unitcost = frappe.db.sql("""SELECT `total_cost`/`quantity`
-			FROM `tabBOM` WHERE name = %s""", self.new_bom)
-		new_bom_unitcost = flt(new_bom_unitcost[0][0]) if new_bom_unitcost else 0
-
 		frappe.db.sql("""update `tabBOM Item` set bom_no=%s,
 			rate=%s, amount=stock_qty*%s where bom_no = %s and docstatus < 2 and parenttype='BOM'""",
-			(self.new_bom, new_bom_unitcost, new_bom_unitcost, self.current_bom))
+			(self.new_bom, unit_cost, unit_cost, self.current_bom))
 
 	def get_parent_boms(self, bom, bom_list=[]):
 		data = frappe.db.sql("""SELECT DISTINCT parent FROM `tabBOM Item`
@@ -65,12 +66,18 @@ class BOMUpdateTool(Document):
 
 		return list(set(bom_list))
 
+def get_new_bom_unit_cost(bom):
+	new_bom_unitcost = frappe.db.sql("""SELECT `total_cost`/`quantity`
+		FROM `tabBOM` WHERE name = %s""", bom)
+
+	return flt(new_bom_unitcost[0][0]) if new_bom_unitcost else 0
+
 @frappe.whitelist()
 def enqueue_replace_bom(args):
 	if isinstance(args, string_types):
 		args = json.loads(args)
 
-	frappe.enqueue("erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.replace_bom", args=args, timeout=4000)
+	frappe.enqueue("erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.replace_bom", args=args, timeout=40000)
 	frappe.msgprint(_("Queued for replacing the BOM. It may take a few minutes."))
 
 @frappe.whitelist()

erpnext/manufacturing/doctype/work_order/test_work_order.py

@@ -14,6 +14,7 @@ from erpnext.stock.utils import get_bin
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
+from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
 
 class TestWorkOrder(unittest.TestCase):
 	def setUp(self):
@@ -82,6 +83,37 @@ class TestWorkOrder(unittest.TestCase):
 		wo_order.set_work_order_operations()
 		self.assertEqual(wo_order.planned_operating_cost, cost*2)
 
+	def test_resered_qty_for_partial_completion(self):
+		item = "_Test Item"
+		warehouse = create_warehouse("Test Warehouse for reserved_qty - _TC")
+
+		bin1_at_start = get_bin(item, warehouse)
+
+		# reset to correct value
+		bin1_at_start.update_reserved_qty_for_production()
+
+		wo_order = make_wo_order_test_record(item="_Test FG Item", qty=2,
+			source_warehouse=warehouse, skip_transfer=1)
+
+		bin1_on_submit = get_bin(item, warehouse)
+
+		# reserved qty for production is updated
+		self.assertEqual(cint(bin1_at_start.reserved_qty_for_production) + 2,
+			cint(bin1_on_submit.reserved_qty_for_production))
+
+		test_stock_entry.make_stock_entry(item_code="_Test Item",
+			target=warehouse, qty=100, basic_rate=100)
+		test_stock_entry.make_stock_entry(item_code="_Test Item Home Desktop 100",
+			target=warehouse, qty=100, basic_rate=100)
+
+		s = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 1))
+		s.submit()
+
+		bin1_at_completion = get_bin(item, warehouse)
+
+		self.assertEqual(cint(bin1_at_completion.reserved_qty_for_production),
+			cint(bin1_on_submit.reserved_qty_for_production) - 1)
+
 	def test_production_item(self):
 		wo_order = make_wo_order_test_record(item="_Test FG Item", qty=1, do_not_save=True)
 		frappe.db.set_value("Item", "_Test FG Item", "end_of_life", "2000-1-1")
@@ -404,7 +436,7 @@ def make_wo_order_test_record(**args):
 	wo_order.company = args.company or "_Test Company"
 	wo_order.stock_uom = args.stock_uom or "_Test UOM"
 	wo_order.use_multi_level_bom=0
-	wo_order.skip_transfer=1
+	wo_order.skip_transfer=args.skip_transfer or 0
 	wo_order.get_items_and_operations_from_bom()
 	wo_order.sales_order = args.sales_order or None
 	wo_order.planned_start_date = args.planned_start_date or now()

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -279,7 +279,7 @@ class WorkOrder(Document):
 			if enable_capacity_planning and job_card_doc:
 				row.planned_start_time = job_card_doc.time_logs[-1].from_time
 				row.planned_end_time = job_card_doc.time_logs[-1].to_time
-
+				print(row.planned_start_time, original_start_time, plan_days)
 				if date_diff(row.planned_start_time, original_start_time) > plan_days:
 					frappe.message_log.pop()
 					frappe.throw(_("Unable to find the time slot in the next {0} days for the operation {1}.")
@@ -468,6 +468,9 @@ class WorkOrder(Document):
 		update bin reserved_qty_for_production
 		called from Stock Entry for production, after submit, cancel
 		'''
+		# calculate consumed qty based on submitted stock entries
+		self.update_consumed_qty_for_required_items()
+
 		if self.docstatus==1:
 			# calculate transferred qty based on submitted stock entries
 			self.update_transaferred_qty_for_required_items()
@@ -475,9 +478,6 @@ class WorkOrder(Document):
 			# update in bin
 			self.update_reserved_qty_for_production()
 
-		# calculate consumed qty based on submitted stock entries
-		self.update_consumed_qty_for_required_items()
-
 	def update_reserved_qty_for_production(self, items=None):
 		'''update reserved_qty_for_production in bins'''
 		for d in self.required_items:

erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js

@@ -22,7 +22,14 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
 					fieldname: 'name1',
 					fieldtype: 'Link',
 					options: 'BOM',
-					change: () => this.fetch_and_render()
+					change: () => this.fetch_and_render(),
+					get_query: () => {
+						return {
+							filters: {
+								"name": ["not in", [this.form.get_value("name2") || ""]]
+							}
+						}
+					}
 				},
 				{
 					fieldtype: 'Column Break'
@@ -32,7 +39,14 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
 					fieldname: 'name2',
 					fieldtype: 'Link',
 					options: 'BOM',
-					change: () => this.fetch_and_render()
+					change: () => this.fetch_and_render(),
+					get_query: () => {
+						return {
+							filters: {
+								"name": ["not in", [this.form.get_value("name1") || ""]]
+							}
+						}
+					}
 				},
 				{
 					fieldtype: 'Section Break'

erpnext/projects/doctype/task/task.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "TASK-.YYYY.-.#####",
  "creation": "2013-01-29 19:25:50",
@@ -200,7 +201,6 @@
   {
    "fieldname": "description",
    "fieldtype": "Text Editor",
-   "in_preview": 1,
    "label": "Task Description",
    "oldfieldname": "description",
    "oldfieldtype": "Text Editor",
@@ -361,11 +361,14 @@
  ],
  "icon": "fa fa-check",
  "idx": 1,
+ "is_tree": 1,
+ "links": [],
  "max_attachments": 5,
- "modified": "2019-09-10 13:46:24.631754",
+ "modified": "2020-03-18 18:08:44.153211",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Task",
+ "nsm_parent_field": "parent_task",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/public/js/utils/dimension_tree_filter.js

@@ -1,23 +1,25 @@
 frappe.provide('frappe.ui.form');
 
-erpnext.doctypes_with_dimensions = ["GL Entry", "Sales Invoice", "Purchase Invoice", "Payment Entry", "Asset",
+let default_dimensions = {};
+
+let doctypes_with_dimensions = ["GL Entry", "Sales Invoice", "Purchase Invoice", "Payment Entry", "Asset",
 	"Expense Claim", "Stock Entry", "Budget", "Payroll Entry", "Delivery Note", "Shipping Rule", "Loyalty Program",
 	"Fee Schedule", "Fee Structure", "Stock Reconciliation", "Travel Request", "Fees", "POS Profile", "Opening Invoice Creation Tool",
 	"Subscription", "Purchase Order", "Journal Entry", "Material Request", "Purchase Receipt", "Landed Cost Item", "Asset"];
 
-erpnext.child_docs = ["Sales Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Journal Entry Account",
+let child_docs = ["Sales Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Journal Entry Account",
 	"Material Request Item", "Delivery Note Item", "Purchase Receipt Item", "Stock Entry Detail", "Payment Entry Deduction",
 	"Landed Cost Item", "Asset Value Adjustment", "Opening Invoice Creation Tool Item", "Subscription Plan"];
 
 frappe.call({
 	method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimension_filters",
-	callback: function(r){
+	callback: function(r) {
 		erpnext.dimension_filters = r.message[0];
-		erpnext.default_dimensions = r.message[1];
+		default_dimensions = r.message[1];
 	}
 });
 
-erpnext.doctypes_with_dimensions.forEach((doctype) => {
+doctypes_with_dimensions.forEach((doctype) => {
 	frappe.ui.form.on(doctype, {
 		onload: function(frm) {
 			erpnext.dimension_filters.forEach((dimension) => {
@@ -27,41 +29,40 @@ erpnext.doctypes_with_dimensions.forEach((doctype) => {
 							"is_group": 0
 						});
 					}
-
-					if (Object.keys(erpnext.default_dimensions).length > 0) {
-						if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
-							if (frm.is_new() && frappe.meta.has_field(doctype, 'company') && frm.doc.company) {
-								frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
-							}
-						}
-
-						if (frm.doc.items && frm.doc.items.length && frm.doc.docstatus === 0
-							&& (!frm.doc.items[0][dimension['fieldname']])) {
-							frm.doc.items[0][dimension['fieldname']] = erpnext.default_dimensions[frm.doc.company][dimension['document_type']];
-						}
-
-						if (frm.doc.accounts && frm.doc.accounts.length && frm.doc.docstatus === 0
-							&& (!frm.doc.items[0][dimension['fieldname']])) {
-							frm.doc.accounts[0][dimension['fieldname']] = erpnext.default_dimensions[frm.doc.company][dimension['document_type']];
-						}
-					}
 				});
 			});
 		},
 
 		company: function(frm) {
-			if(frm.doc.company && (Object.keys(erpnext.default_dimensions).length > 0)) {
+			if(frm.doc.company && (Object.keys(default_dimensions || {}).length > 0)
-				erpnext.dimension_filters.forEach((dimension) => {
+				&& default_dimensions[frm.doc.company]) {
-					if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
+				frm.trigger('update_dimension');
-						frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
-					}
-				});
 			}
 		},
+
+		update_dimension: function(frm) {
+			erpnext.dimension_filters.forEach((dimension) => {
+				if (frm.is_new()) {
+					if (frm.doc.company && Object.keys(default_dimensions || {}).length > 0
+						&& default_dimensions[frm.doc.company]) {
+
+						if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
+							frm.set_value(dimension['fieldname'],
+								default_dimensions[frm.doc.company][dimension['document_type']]);
+						}
+
+						$.each(frm.doc.items || frm.doc.accounts || [], function(i, row) {
+							frappe.model.set_value(row.doctype, row.name, dimension['fieldname'],
+								default_dimensions[frm.doc.company][dimension['document_type']])
+						});
+					}
+				}
+			});
+		}
 	});
 });
 
-erpnext.child_docs.forEach((doctype) => {
+child_docs.forEach((doctype) => {
 	frappe.ui.form.on(doctype, {
 		items_add: function(frm, cdt, cdn) {
 			erpnext.dimension_filters.forEach((dimension) => {
@@ -77,14 +78,6 @@ erpnext.child_docs.forEach((doctype) => {
 			});
 		},
 
-		company: function(frm) {
-			if(frm.doc.company) {
-				erpnext.dimension_filters.forEach((dimension) => {
-					frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
-				});
-			}
-		},
-
 		items_add: function(frm, cdt, cdn) {
 			erpnext.dimension_filters.forEach((dimension) => {
 				var row = frappe.get_doc(cdt, cdn);

erpnext/public/js/utils/serial_no_batch_selector.js

@@ -313,11 +313,15 @@ erpnext.SerialNoBatchSelector = Class.extend({
 								frappe.throw(__(`Batch ${val} already selected.`));
 								return;
 							}
+
+							let batch_number = me.item.batch_no ||
+								this.grid_row.on_grid_fields_dict.batch_no.get_value();
+
 							if (me.warehouse_details.name) {
 								frappe.call({
 									method: 'erpnext.stock.doctype.batch.batch.get_batch_qty',
 									args: {
-										batch_no: me.item.batch_no,
+										batch_no: batch_number,
 										warehouse: me.warehouse_details.name,
 										item_code: me.item_code
 									},

erpnext/quality_management/doctype/quality_procedure/quality_procedure.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "format:PRC-{quality_procedure_name}",
  "creation": "2018-10-06 00:06:29.756804",
  "doctype": "DocType",
@@ -69,10 +70,13 @@
    "reqd": 1
   }
  ],
- "modified": "2019-08-05 13:09:29.945082",
+ "is_tree": 1,
+ "links": [],
+ "modified": "2020-03-18 18:09:29.371627",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Procedure",
+ "nsm_parent_field": "parent_quality_procedure",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/regional/india/utils.py

@@ -478,7 +478,7 @@ def get_gstins_for_company(company):
 			`tabDynamic Link`.parent = `tabAddress`.name and
 			`tabDynamic Link`.parenttype = 'Address' and
 			`tabDynamic Link`.link_doctype = 'Company' and
-			`tabDynamic Link`.link_name = '{0}'""".format(company))
+			`tabDynamic Link`.link_name = %(company)s""", {"company": company})
 	return company_gstins
 
 def get_address_details(data, doc, company_address, billing_address):

erpnext/selling/doctype/customer/customer.py

@@ -76,7 +76,8 @@ class Customer(TransactionBase):
 	def validate_default_bank_account(self):
 		if self.default_bank_account:
 			is_company_account = frappe.db.get_value('Bank Account', self.default_bank_account, 'is_company_account')
-			frappe.throw(_("{0} is not a company bank account").format(frappe.bold(self.default_bank_account)))
+			if not is_company_account:
+				frappe.throw(_("{0} is not a company bank account").format(frappe.bold(self.default_bank_account)))
 
 	def on_update(self):
 		self.validate_name_with_customer_group()

erpnext/selling/doctype/sales_order/sales_order.py

@@ -641,7 +641,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
 			target.set_advances()
 
 	def set_missing_values(source, target):
-		target.is_pos = 0
 		target.ignore_pricing_rule = 1
 		target.flags.ignore_permissions = True
 		target.run_method("set_missing_values")

erpnext/setup/doctype/company/company.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:company_name",
@@ -725,10 +726,13 @@
  "icon": "fa fa-building",
  "idx": 1,
  "image_field": "company_logo",
- "modified": "2019-11-22 13:04:47.470768",
+ "is_tree": 1,
+ "links": [],
+ "modified": "2020-03-18 18:09:53.534211",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
+ "nsm_parent_field": "parent_company",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/setup/doctype/company/test_company.py

@@ -9,7 +9,7 @@ from frappe import _
 from frappe.utils import random_string
 from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import get_charts_for_country
 
-test_ignore = ["Account", "Cost Center", "Payment Terms Template", "Salary Component"]
+test_ignore = ["Account", "Cost Center", "Payment Terms Template", "Salary Component", "Warehouse"]
 test_dependencies = ["Fiscal Year"]
 test_records = frappe.get_test_records('Company')
 

erpnext/setup/doctype/customer_group/customer_group.json

@@ -137,11 +137,13 @@
  ],
  "icon": "fa fa-sitemap",
  "idx": 1,
+ "is_tree": 1,
  "links": [],
- "modified": "2020-01-28 13:49:23.961708",
+ "modified": "2020-03-18 18:10:13.048492",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Customer Group",
+ "nsm_parent_field": "parent_customer_group",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/setup/doctype/item_group/item_group.json

@@ -185,13 +185,15 @@
  "icon": "fa fa-sitemap",
  "idx": 1,
  "image_field": "image",
+ "is_tree": 1,
  "links": [],
  "max_attachments": 3,
- "modified": "2020-01-28 13:51:05.456014",
+ "modified": "2020-03-18 18:10:34.383363",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Item Group",
  "name_case": "Title Case",
+ "nsm_parent_field": "parent_item_group",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/setup/doctype/sales_person/sales_person.json

@@ -143,11 +143,13 @@
  ],
  "icon": "icon-user",
  "idx": 1,
+ "is_tree": 1,
  "links": [],
- "modified": "2020-01-28 13:50:31.891050",
+ "modified": "2020-03-18 18:11:13.968024",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Sales Person",
+ "nsm_parent_field": "parent_sales_person",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/setup/doctype/supplier_group/supplier_group.json

@@ -1,481 +1,163 @@
 {
- "allow_copy": 0,
+ "actions": [],
- "allow_guest_to_view": 0,
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:supplier_group_name",
- "beta": 0,
  "creation": "2013-01-10 16:34:24",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Setup",
- "editable_grid": 0,
+ "field_order": [
+  "supplier_group_name",
+  "parent_supplier_group",
+  "is_group",
+  "section_credit_limit",
+  "payment_terms",
+  "default_payable_account",
+  "accounts",
+  "lft",
+  "rgt",
+  "old_parent"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "supplier_group_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Supplier Group Name",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "supplier_type",
    "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "parent_supplier_group",
    "fieldtype": "Link",
-   "hidden": 0,
    "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Parent Supplier Group",
-   "length": 0,
+   "options": "Supplier Group"
-   "no_copy": 0,
-   "options": "Supplier Group",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
+   "default": "0",
-   "columns": 0,
    "fieldname": "is_group",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
+   "label": "Is Group"
-   "label": "Is Group",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "section_credit_limit",
    "fieldtype": "Section Break",
-   "hidden": 0,
+   "label": "Credit Limit"
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Credit Limit",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "payment_terms",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Default Payment Terms Template",
-   "length": 0,
+   "options": "Payment Terms Template"
-   "no_copy": 0,
-   "options": "Payment Terms Template",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "default_payable_account",
    "fieldtype": "Section Break",
-   "hidden": 0,
+   "label": "Default Payable Account"
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Payable Account",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:!doc.__islocal",
    "description": "Mention if non-standard receivable account applicable",
    "fieldname": "accounts",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Accounts",
-   "length": 0,
+   "options": "Party Account"
-   "no_copy": 0,
-   "options": "Party Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "lft",
    "fieldtype": "Int",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "lft",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
    "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
    "report_hide": 1,
-   "reqd": 0,
+   "search_index": 1
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "rgt",
    "fieldtype": "Int",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "rgt",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
    "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
    "report_hide": 1,
-   "reqd": 0,
+   "search_index": 1
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "old_parent",
    "fieldtype": "Link",
    "hidden": 1,
    "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Old Parent",
-   "length": 0,
    "no_copy": 1,
    "options": "Supplier Group",
-   "permlevel": 0,
-   "precision": "",
    "print_hide": 1,
-   "print_hide_if_no_value": 0,
+   "report_hide": 1
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-flag",
  "idx": 1,
- "image_view": 0,
+ "is_tree": 1,
- "in_create": 0,
+ "links": [],
- "is_submittable": 0,
+ "modified": "2020-03-18 18:10:49.228407",
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-08-29 06:25:57.589824",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Supplier Group",
+ "nsm_parent_field": "parent_supplier_group",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "Purchase Manager",
+   "role": "Purchase Manager"
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
   },
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "Purchase User",
+   "role": "Purchase User"
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
    "import": 1,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Purchase Master Manager",
    "set_user_permissions": 1,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
    "permlevel": 1,
-   "print": 0,
    "read": 1,
-   "report": 0,
    "role": "Purchase Master Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
    "permlevel": 1,
-   "print": 0,
    "read": 1,
-   "report": 0,
+   "role": "Purchase Manager"
-   "role": "Purchase Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
   },
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
    "permlevel": 1,
-   "print": 0,
    "read": 1,
-   "report": 0,
+   "role": "Purchase User"
-   "role": "Purchase User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 1,
- "sort_order": "ASC",
+ "sort_order": "ASC"
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
 }

erpnext/setup/doctype/territory/territory.json

@@ -121,12 +121,14 @@
  ],
  "icon": "fa fa-map-marker",
  "idx": 1,
+ "is_tree": 1,
  "links": [],
- "modified": "2020-01-28 13:49:31.905800",
+ "modified": "2020-03-18 18:11:36.623555",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Territory",
  "name_case": "Title Case",
+ "nsm_parent_field": "parent_territory",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/setup/utils.py

@@ -142,6 +142,6 @@ def insert_record(records):
 				raise
 
 def welcome_email():
-	site_name = get_default_company()
+	site_name = get_default_company() or "ERPNext"
 	title = _("Welcome to {0}").format(site_name)
 	return title

erpnext/stock/doctype/bin/bin.py

@@ -69,15 +69,21 @@ class Bin(Document):
 		'''Update qty reserved for production from Production Item tables
 			in open work orders'''
 		self.reserved_qty_for_production = frappe.db.sql('''
-			select sum(item.required_qty - item.transferred_qty)
+			SELECT
-			from `tabWork Order` pro, `tabWork Order Item` item
+				CASE WHEN ifnull(skip_transfer, 0) = 0 THEN
-			where
+					SUM(item.required_qty - item.transferred_qty)
+				ELSE
+					SUM(item.required_qty - item.consumed_qty)
+				END
+			FROM `tabWork Order` pro, `tabWork Order Item` item
+			WHERE
 				item.item_code = %s
 				and item.parent = pro.name
 				and pro.docstatus = 1
 				and item.source_warehouse = %s
 				and pro.status not in ("Stopped", "Completed")
-				and item.required_qty > item.transferred_qty''', (self.item_code, self.warehouse))[0][0]
+				and (item.required_qty > item.transferred_qty or item.required_qty > item.consumed_qty)
+		''', (self.item_code, self.warehouse))[0][0]
 
 		self.set_projected_qty()
 

erpnext/stock/doctype/delivery_note/delivery_note.py

@@ -414,7 +414,6 @@ def make_sales_invoice(source_name, target_doc=None):
 	invoiced_qty_map = get_invoiced_qty_map(source_name)
 
 	def set_missing_values(source, target):
-		target.is_pos = 0
 		target.ignore_pricing_rule = 1
 		target.run_method("set_missing_values")
 		target.run_method("set_po_nos")

erpnext/stock/doctype/delivery_trip/delivery_trip.py

@@ -238,7 +238,7 @@ class DeliveryTrip(Document):
 		try:
 			directions = maps_client.directions(**directions_data)
 		except Exception as e:
-			frappe.throw(_(e))
+			frappe.throw(_(str(e)))
 
 		return directions[0] if directions else False
 

erpnext/stock/doctype/item/item.py

@@ -183,12 +183,17 @@ class Item(WebsiteGenerator):
 		# default warehouse, or Stores
 		for default in self.item_defaults or [frappe._dict({'company': frappe.defaults.get_defaults().company})]:
 			default_warehouse = (default.default_warehouse
-					or frappe.db.get_single_value('Stock Settings', 'default_warehouse')
+					or frappe.db.get_single_value('Stock Settings', 'default_warehouse'))
-					or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')}))
+			if default_warehouse:
+				warehouse_company = frappe.db.get_value("Warehouse", default_warehouse, "company")
+			
+			if not default_warehouse or warehouse_company != default.company:
+				default_warehouse = frappe.db.get_value('Warehouse',
+					{'warehouse_name': _('Stores'), 'company': default.company})
 
 			if default_warehouse:
 				stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse, qty=self.opening_stock,
-												rate=self.valuation_rate, company=default.company)
+					rate=self.valuation_rate, company=default.company)
 
 				stock_entry.add_comment("Comment", _("Opening Stock"))
 

erpnext/stock/doctype/item_alternative/item_alternative.py

@@ -22,6 +22,21 @@ class ItemAlternative(Document):
 		if self.item_code == self.alternative_item_code:
 			frappe.throw(_("Alternative item must not be same as item code"))
 
+		item_meta = frappe.get_meta("Item")
+		fields = ["is_stock_item", "include_item_in_manufacturing","has_serial_no","has_batch_no"]
+		item_data = frappe.db.get_values("Item", self.item_code, fields, as_dict=1)
+		alternative_item_data = frappe.db.get_values("Item", self.alternative_item_code, fields, as_dict=1)
+
+		for field in fields:
+			if  item_data[0].get(field) != alternative_item_data[0].get(field):
+				raise_exception, alert = [1, False] if field == "is_stock_item" else [0, True]
+
+				frappe.msgprint(_("The value of {0} differs between Items {1} and {2}") \
+					.format(frappe.bold(item_meta.get_label(field)),
+							frappe.bold(self.alternative_item_code),
+							frappe.bold(self.item_code)),
+					alert=alert, raise_exception=raise_exception)
+
 	def validate_duplicate(self):
 		if frappe.db.get_value("Item Alternative", {'item_code': self.item_code,
 			'alternative_item_code': self.alternative_item_code, 'name': ('!=', self.name)}):

erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py

@@ -104,7 +104,6 @@ class LandedCostVoucher(Document):
 	def update_landed_cost(self):
 		for d in self.get("purchase_receipts"):
 			doc = frappe.get_doc(d.receipt_document_type, d.receipt_document)
-			
 			# check if there are {qty} assets created and linked to this receipt document
 			self.validate_asset_qty_and_status(d.receipt_document_type, doc)
 
@@ -123,6 +122,8 @@ class LandedCostVoucher(Document):
 			# update latest valuation rate in serial no
 			self.update_rate_in_serial_no_for_non_asset_items(doc)
 
+		for d in self.get("purchase_receipts"):
+			doc = frappe.get_doc(d.receipt_document_type, d.receipt_document)
 			# update stock & gl entries for cancelled state of PR
 			doc.docstatus = 2
 			doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

@@ -53,7 +53,7 @@ class TestPurchaseReceipt(unittest.TestCase):
 		self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
 	
 	def test_batched_serial_no_purchase(self):
-		item = frappe.get_doc("Item", { 'item_name': 'Batched Serialized Item' })
+		item = frappe.db.exists("Item", {'item_name': 'Batched Serialized Item'})
 		if not item:
 			item = create_item("Batched Serialized Item")
 			item.has_batch_no = 1
@@ -62,6 +62,8 @@ class TestPurchaseReceipt(unittest.TestCase):
 			item.batch_number_series = "BS-BATCH-.##"
 			item.serial_no_series = "BS-.####"
 			item.save()
+		else:
+			item = frappe.get_doc("Item", {'item_name': 'Batched Serialized Item'})
 
 		pr = make_purchase_receipt(item_code=item.name, qty=5, rate=500)
 
@@ -302,6 +304,8 @@ class TestPurchaseReceipt(unittest.TestCase):
 		self.assertEqual(serial_no, frappe.db.get_value("Serial No",
 			{"purchase_document_type": "Purchase Receipt", "purchase_document_no": pr_doc.name}, "name"))
 
+		pr_doc.cancel()
+
 		#check for the auto created serial nos
 		item_code = "Test Auto Created Serial No"
 		if not frappe.db.exists("Item", item_code):
@@ -317,9 +321,9 @@ class TestPurchaseReceipt(unittest.TestCase):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
-		item_code = frappe.db.get_value('Item', {'has_serial_no': 1, 'is_fixed_asset': 0})
+		item_code = frappe.db.get_value('Item', {'has_serial_no': 1, 'is_fixed_asset': 0, "has_batch_no": 0})
 		if not item_code:
-			item = make_item("Test Serial Item 1", dict(has_serial_no=1))
+			item = make_item("Test Serial Item 1", dict(has_serial_no=1, has_batch_no=0))
 			item_code = item.name
 
 		serial_no = random_string(5)

erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

@@ -832,7 +832,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-03-05 14:19:48.799370",
+ "modified": "2020-03-11 14:19:48.799370",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt Item",

erpnext/stock/doctype/stock_entry/stock_entry.js

@@ -60,7 +60,8 @@ frappe.ui.form.on('Stock Entry', {
 					}
 				}
 
-				if(item.s_warehouse) filters["warehouse"] = item.s_warehouse;
+				filters["warehouse"] = item.s_warehouse || item.t_warehouse;
+
 				return {
 					query : "erpnext.controllers.queries.get_batch_no",
 					filters: filters
@@ -964,10 +965,8 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
 		}
 	}
 
-	if(item && item.has_serial_no
+	if(item && !item.has_serial_no && !item.has_batch_no) return;
-		&& frm.doc.purpose === 'Material Receipt') {
+	if (frm.doc.purpose === 'Material Receipt') return;
-		return;
-	}
 
 	frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
 		new erpnext.SerialNoBatchSelector({

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -177,6 +177,10 @@ class StockEntry(StockController):
 		stock_items = self.get_stock_items()
 		serialized_items = self.get_serialized_items()
 		for item in self.get("items"):
+			if item.qty and item.qty < 0:
+				frappe.throw(_("Row {0}: The item {1}, quantity must be positive number")
+					.format(item.idx, frappe.bold(item.item_code)))
+
 			if item.item_code not in stock_items:
 				frappe.throw(_("{0} is not a stock Item").format(item.item_code))
 

erpnext/stock/doctype/warehouse/warehouse.json

@@ -228,11 +228,13 @@
  ],
  "icon": "fa fa-building",
  "idx": 1,
+ "is_tree": 1,
  "links": [],
- "modified": "2020-01-28 13:50:59.368846",
+ "modified": "2020-03-18 18:11:53.282358",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Warehouse",
+ "nsm_parent_field": "parent_warehouse",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/stock/report/stock_projected_qty/stock_projected_qty.py

@@ -44,7 +44,9 @@ def execute(filters=None):
 				re_order_level = d.warehouse_reorder_level
 				re_order_qty = d.warehouse_reorder_qty
 
-		shortage_qty = re_order_level - flt(bin.projected_qty) if (re_order_level or re_order_qty) else 0
+		shortage_qty = 0
+		if (re_order_level or re_order_qty) and re_order_level > bin.projected_qty:
+			shortage_qty = re_order_level - flt(bin.projected_qty)
 
 		data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse,
 			item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty,

erpnext/translations/af.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Aanstellingsbesprek
 DocType: Work Order Operation,Work In Progress,Werk aan die gang
 DocType: Leave Control Panel,Branch (optional),Tak (opsioneel)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Kies asseblief datum
-DocType: Item Price,Minimum Qty ,Minimum aantal
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimum aantal
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekursie van die BOM: {0} kan nie die kind van {1} wees nie
 DocType: Finance Book,Finance Book,Finansies Boek
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Vakansie Lys
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Die ouerrekening {0} bestaan nie
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Hersiening en aksie
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Hierdie werknemer het reeds 'n logboek met dieselfde tydstempel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,rekenmeester
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Pens
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Wins / verlies
 DocType: Crop,Perennial,meerjarige
 DocType: Program,Is Published,Word gepubliseer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Wys afleweringsnotas
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Om oorfakturering toe te laat, moet u "Toelae vir oorfakturering" in rekeninginstellings of die item opdateer."
 DocType: Patient Appointment,Procedure,prosedure
 DocType: Accounts Settings,Use Custom Cash Flow Format,Gebruik aangepaste kontantvloeiformaat
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Risiko faktore
 DocType: Patient,Occupational Hazards and Environmental Factors,Beroepsgevare en omgewingsfaktore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Voorraadinskrywings wat reeds vir werkorder geskep is
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Itemkode> Itemgroep> Merk
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Kyk vorige bestellings
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} gesprekke
 DocType: Vital Signs,Respiratory rate,Respiratoriese tempo
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,'N Fout het voorgekom tydens die opdateringsproses
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant bespreking
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,U items
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Verskaffer> Verskaffer tipe
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Voorstel Skryf
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Inskrywing Aftrek
 DocType: Service Level Priority,Service Level Priority,Prioriteit op diensvlak
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Kies asseblief Maatskappy en Posdatum om inskrywings te kry
 DocType: Asset,Maintenance,onderhoud
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Kry van pasiënt ontmoeting
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -> {1}) nie vir item gevind nie: {2}
 DocType: Subscriber,Subscriber,intekenaar
 DocType: Item Attribute Value,Item Attribute Value,Item Attribuutwaarde
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Geldwissel moet van toepassing wees vir koop of verkoop.
@@ -1936,7 +1931,6 @@ DocType: Sales Invoice Item,Rate With Margin,Beoordeel Met Marge
 DocType: Purchase Invoice,Is Return (Debit Note),Is Terugbetaling (Debiet Nota)
 DocType: Workstation,Wages,lone
 DocType: Asset Maintenance,Maintenance Manager Name,Onderhoudbestuurder Naam
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Daar bestaan reeds transaksies teen die onderneming!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Versoek webwerf
 DocType: Agriculture Task,Urgent,dringende
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Rekords gaan haal ......
@@ -2633,7 +2627,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Die betalingstermyn by ry {0} is moontlik 'n duplikaat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Landbou (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Packing Slip
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series in vir {0} via Setup> Settings> Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Opstel SMS gateway instellings
 DocType: Disease,Common Name,Algemene naam
@@ -2799,7 +2792,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Blare suksesvol toegeken vir {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Geen items om te pak nie
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Slegs .csv- en .xlsx-lêers word tans ondersteun
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Stel asseblief 'n naamstelsel vir werknemers in vir mensehulpbronne> HR-instellings
 DocType: Shipping Rule Condition,From Value,Uit Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Vervaardiging Hoeveelheid is verpligtend
 DocType: Loan,Repayment Method,Terugbetaling Metode
@@ -4046,7 +4038,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Vereis Aan
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","As dit gemerk is, verberg en deaktiveer u die veld Afgeronde totaal in salarisstrokies"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Dit is die standaardverrekening (dae) vir die afleweringsdatum in verkoopsbestellings. Die terugwaartse verrekening is 7 dae vanaf die datum van die bestellingsplasing.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Stel nommeringreekse op vir bywoning via Setup> Numbering Series
 DocType: Rename Tool,File to Rename,Lêer om hernoem te word
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Kies asseblief BOM vir item in ry {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Haal intekeningopdaterings
@@ -4649,7 +4640,6 @@ DocType: Healthcare Service Unit Type,Item Details,Itembesonderhede
 DocType: Cash Flow Mapping,Is Finance Cost,Is finansieringskoste
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Bywoning vir werknemer {0} is reeds gemerk
 DocType: Packing Slip,If more than one package of the same type (for print),As meer as een pakket van dieselfde tipe (vir druk)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Stel asb. Die opvoeder-naamstelsel op in onderwys> Onderwysinstellings
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Stel asseblief die standaardkliënt in Restaurantinstellings
 ,Salary Register,Salarisregister
 DocType: Company,Default warehouse for Sales Return,Standaard pakhuis vir verkoopsopgawe
@@ -4920,7 +4910,6 @@ DocType: Item,Inspection Required before Purchase,Inspeksie Vereis Voor Aankope
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Hangende aktiwiteite
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Skep labtoets
 DocType: Patient Appointment,Reminded,herinner
-DocType: Homepage Section,Cards,kaarte
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Bekyk grafiek van rekeninge
 DocType: Chapter Member,Chapter Member,Hooflid
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum bestelhoeveelheid
@@ -4938,7 +4927,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Toekomstige datums nie toegelaat nie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Verwagte afleweringsdatum moet na-verkope besteldatum wees
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Herbestel vlak
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Sjabloon van rekeninge
+DocType: Company,Chart Of Accounts Template,Sjabloon van rekeninge
 DocType: Attendance,Attendance Date,Bywoningsdatum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Opdateringsvoorraad moet vir die aankoopfaktuur {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Itemprys opgedateer vir {0} in Pryslys {1}
@@ -5503,8 +5492,6 @@ DocType: Installation Note,Installation Date,Installasie Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Deel Grootboek
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Verkoopsfaktuur {0} geskep
 DocType: Employee,Confirmation Date,Bevestigingsdatum
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Skrap die werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 DocType: Inpatient Occupancy,Check Out,Uitteken
 DocType: C-Form,Total Invoiced Amount,Totale gefaktureerde bedrag
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Minimum hoeveelheid kan nie groter wees as Max
@@ -5711,7 +5698,6 @@ DocType: Employee,Prefered Contact Email,Voorkeur Kontak E-pos
 DocType: Cheque Print Template,Cheque Width,Kyk breedte
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Valideer Verkoopprys vir Item teen Aankoopprys of Waardasietarief
 DocType: Fee Schedule,Fee Schedule,Fooibedule
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolom Etikette:
 DocType: Bank Transaction,Settled,gevestig
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,ning
 DocType: Quality Feedback,Parameters,Grense
@@ -6385,6 +6371,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,O
 DocType: Salary Component,Formula,formule
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serie #
 DocType: Material Request Plan Item,Required Quantity,Vereiste hoeveelheid
+DocType: Cash Flow Mapping Template,Template Name,Sjabloon Naam
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Rekeningkundige tydperk oorvleuel met {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Verkooprekening
@@ -6445,7 +6432,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Check Date
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Ouerrekening {1} behoort nie aan maatskappy nie: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Suksesvol verwyder alle transaksies met betrekking tot hierdie maatskappy!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Soos op datum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Soos op datum
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Inskrywingsdatum
 DocType: Healthcare Settings,Out Patient SMS Alerts,Uit Pasiënt SMS Alert
@@ -6511,7 +6498,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Vasvra
 DocType: Subscription,Trial Period End Date,Proefperiode Einddatum
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Nie outhroized sedert {0} oorskry limiete
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Begin data van hier af invoer:
 DocType: Serial No,Asset Status,Bate Status
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Oor Dimensionele Lading (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurant Tafel
@@ -6737,7 +6723,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Dien
 DocType: Contract,Party User,Party gebruiker
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Bates nie geskep vir <b>{0}</b> . U moet bates met die hand opstel.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Stel asseblief die Maatskappyfilter leeg as Groep By &#39;Maatskappy&#39; is.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Gebied
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posdatum kan nie toekomstige datum wees nie
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Ry # {0}: reeksnommer {1} stem nie ooreen met {2} {3}
 DocType: Loan Repayment,Interest Payable,Rente betaalbaar
@@ -6970,7 +6955,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Gemiddelde koers
 DocType: Appointment,Appointment With,Afspraak met
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totale Betalingsbedrag in Betaalskedule moet gelyk wees aan Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merk bywoning as <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Klant voorsien artikel&quot; kan nie &#39;n waardasiekoers hê nie
 DocType: Subscription Plan Detail,Plan,plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankstaatbalans soos per Algemene Grootboek
@@ -7661,7 +7645,6 @@ DocType: Item Customer Detail,Item Customer Detail,Item kliënt detail
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimum voordeelbedrag van werknemer {0} oorskry {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Totale toegekende blare is meer as dae in die tydperk
 DocType: Linked Soil Analysis,Linked Soil Analysis,Gekoppelde grondanalise
-DocType: Pricing Rule,Percentage,persentasie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Item {0} moet &#39;n voorraaditem wees
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Verstek werk in voortgang Warehouse
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Bylaes vir {0} oorvleuelings, wil jy voortgaan nadat jy oorlaaide gleuwe geslaan het?"

erpnext/translations/am.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,የቀጠሮ ማስ
 DocType: Work Order Operation,Work In Progress,ገና በሂደት ላይ ያለ ስራ
 DocType: Leave Control Panel,Branch (optional),ቅርንጫፍ (አማራጭ)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,ቀን ይምረጡ
-DocType: Item Price,Minimum Qty ,አነስተኛ ሂሳብ
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,አነስተኛ ሂሳብ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM ድግግሞሽ-{0} የ {1} ልጅ መሆን አይችልም
 DocType: Finance Book,Finance Book,የገንዘብ መጽሐፍ
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-yYYYY.-
 DocType: Appointment Booking Settings,Holiday List,የበዓል ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,የወላጅ መለያ {0} የለም
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,ክለሳ እና ተግባር ፡፡
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},ይህ ሠራተኛ ቀድሞውኑ በተመሳሳይ የጊዜ ማህተም የተረጋገጠ መዝገብ አለው። {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,ሒሳብ ሠራተኛ
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,የ
 DocType: Exchange Rate Revaluation Account,Gain/Loss,ትርፍ ማግኘት / ኪሳራ / ኪሳራ
 DocType: Crop,Perennial,የብዙ ዓመት
 DocType: Program,Is Published,ታትሟል ፡፡
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,የአቅርቦት ማስታወሻዎችን አሳይ።
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",የክፍያ መጠየቂያ ከልክ በላይ ለመፍቀድ በመለያዎች ቅንብሮች ወይም በንጥል ውስጥ «ከመጠን በላይ የክፍያ አበል» ን ያዘምኑ።
 DocType: Patient Appointment,Procedure,ሂደት
 DocType: Accounts Settings,Use Custom Cash Flow Format,ብጁ የገንዘብ ፍሰት ቅርጸት ተጠቀም
@@ -978,7 +976,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,የጭንቀት ሁኔታዎች
 DocType: Patient,Occupational Hazards and Environmental Factors,የሥራ ጉዳት እና የአካባቢ ብክለቶች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,ክምችት ምዝገባዎች ቀድሞ ለስራ ትእዛዝ ተዘጋጅተዋል
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,የንጥል ኮድ> የንጥል ቡድን> የምርት ስም
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,ያለፉ ትዕዛዞችን ይመልከቱ።
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} ውይይቶች።
 DocType: Vital Signs,Respiratory rate,የመተንፈሻ መጠን
@@ -1136,7 +1133,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,በማዘመን ሂደቱ ጊዜ ስህተት ተከስቷል
 DocType: Restaurant Reservation,Restaurant Reservation,የምግብ ቤት ቦታ ማስያዣ
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,ዕቃዎችዎ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,አቅራቢ> የአቅራቢ ዓይነት
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,ሐሳብ መጻፍ
 DocType: Payment Entry Deduction,Payment Entry Deduction,የክፍያ Entry ተቀናሽ
 DocType: Service Level Priority,Service Level Priority,የአገልግሎት ደረጃ ቅድሚያ።
@@ -1435,7 +1431,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,እባክዎ ግቤቶችን ለመመዝገብ እባክዎ ኩባንያ እና የድረ-ገጽ ቀንን ይምረጡ
 DocType: Asset,Maintenance,ጥገና
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,ከታካሚዎች ግኝት ያግኙ
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -> {1}) ለእንጥል አልተገኘም {{2}
 DocType: Subscriber,Subscriber,ደንበኛ
 DocType: Item Attribute Value,Item Attribute Value,ንጥል ዋጋ የአይነት
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,የምንዛሬ ልውውጥ ለግዢ ወይም ለሽያጭ ተፈጻሚ መሆን አለበት.
@@ -1933,7 +1928,6 @@ DocType: Sales Invoice Item,Rate With Margin,ኅዳግ ጋር ፍጥነት
 DocType: Purchase Invoice,Is Return (Debit Note),ተመላሽ ይባላል (ዕዳ መግለጫ)
 DocType: Workstation,Wages,ደመወዝ
 DocType: Asset Maintenance,Maintenance Manager Name,የጥገና አስተዳዳሪ ስም
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,በድርጅቱ ላይ ግብይቶች ቀድሞውኑ ነበሩ!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,ጣቢያ መጠየቅ
 DocType: Agriculture Task,Urgent,አስቸኳይ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,መዝገቦችን በማምጣት ላይ ……
@@ -2795,7 +2789,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},ለ በተሳካ ሁኔታ የተመደበ ማምለኩን {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,ምንም ንጥሎች ለመሸከፍ
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,በአሁኑ ጊዜ .csv እና .xlsx ፋይሎች ብቻ ይደገፋሉ።
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,በሰብአዊ ሀብት> የሰው ሠራሽ ቅንብሮች ውስጥ የሰራተኛ መለያ ስም መስሪያ ስርዓት ያዋቅሩ
 DocType: Shipping Rule Condition,From Value,እሴት ከ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,ከማኑፋክቸሪንግ ብዛት የግዴታ ነው
 DocType: Loan,Repayment Method,ብድር መክፈል ስልት
@@ -4039,7 +4032,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,ያስፈልጋል ላይ
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips",ከተረጋገጠ ፣ ደሞዝ እና አቦዝን በ Salary Slips ውስጥ የተጠጋጋ አጠቃላይ መስክ
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,በሽያጭ ትዕዛዞችን ማቅረቢያ ቀን ይህ ነባሪ ማካካሻ (ቀናት) ነው። ውድድሩ ማካካሻ ትዕዛዙ ከምደባ ከተሰጠበት ቀን ጀምሮ 7 ቀናት ነው።
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,እባክዎን ለተማሪ ተገኝነት በማዋቀር> የቁጥር ተከታታይ በኩል ያዘጋጁ
 DocType: Rename Tool,File to Rename,ዳግም ሰይም ፋይል
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},ረድፍ ውስጥ ንጥል ለማግኘት BOM ይምረጡ {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,የደንበኝነት ምዝገባ ዝመናዎችን በማምጣት ላይ
@@ -4639,7 +4631,6 @@ DocType: Healthcare Service Unit Type,Item Details,የንጥል ዝርዝሮች
 DocType: Cash Flow Mapping,Is Finance Cost,የፋይናንስ ወጪ ነው
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,ሠራተኛ {0} ክትትልን አስቀድሞ ምልክት ነው
 DocType: Packing Slip,If more than one package of the same type (for print),ከሆነ ተመሳሳይ ዓይነት ከአንድ በላይ ጥቅል (የህትመት ለ)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,እባክዎ በትምህርቱ> የትምህርት ቅንብሮች ውስጥ አስተማሪ ስም ማጎሪያ ስርዓት ያዋቅሩ
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,እባክዎ በሆቴሎች ቅንጅቶች ውስጥ ነባሪ ደንበኛ ያዘጋጁ
 ,Salary Register,ደመወዝ ይመዝገቡ
 DocType: Company,Default warehouse for Sales Return,ለሽያጭ ተመላሽ ነባሪ መጋዘን
@@ -4910,7 +4901,6 @@ DocType: Item,Inspection Required before Purchase,የምርመራው ግዢ በ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,በመጠባበቅ ላይ እንቅስቃሴዎች
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,የቤተ ሙከራ ሙከራ ይፍጠሩ
 DocType: Patient Appointment,Reminded,አስታውሷል
-DocType: Homepage Section,Cards,ካርዶች
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,የመለያዎች ሰንጠረዥ ይመልከቱ
 DocType: Chapter Member,Chapter Member,የምዕራፍ አባል
 DocType: Material Request Plan Item,Minimum Order Quantity,አነስተኛ የትዕዛዝ ብዛት
@@ -4928,7 +4918,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,የወደፊት ቀናት አይፈቀዱም
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,የተያዘው የመላኪያ ቀን ከሽያጭ ትእዛዝ ቀን በኋላ መሆን አለበት
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,አስይዝ ደረጃ
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,መለያዎች አብነት ነው ገበታ
+DocType: Company,Chart Of Accounts Template,መለያዎች አብነት ነው ገበታ
 DocType: Attendance,Attendance Date,በስብሰባው ቀን
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},ክምችት አዘምን ለግዢ ሂሳብ {0} መንቃት አለበት
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},የእቃ ዋጋ {0} ውስጥ የዋጋ ዝርዝር ዘምኗል {1}
@@ -5492,8 +5482,6 @@ DocType: Installation Note,Installation Date,መጫን ቀን
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Ledger አጋራ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,የሽያጭ ደረሰኝ {0} ተፈጥሯል
 DocType: Employee,Confirmation Date,ማረጋገጫ ቀን
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ይህንን ሰነድ ለመሰረዝ እባክዎ ሰራተኛውን <a href=""#Form/Employee/{0}"">{0}</a> \ ያጥፉ"
 DocType: Inpatient Occupancy,Check Out,ጨርሰህ ውጣ
 DocType: C-Form,Total Invoiced Amount,ጠቅላላ በደረሰኝ የተቀመጠው መጠን
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,ዝቅተኛ ብዛት ማክስ ብዛት በላይ ሊሆን አይችልም
@@ -5698,7 +5686,6 @@ DocType: Employee,Prefered Contact Email,Prefered የእውቂያ ኢሜይል
 DocType: Cheque Print Template,Cheque Width,ቼክ ስፋት
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,የግዢ Rate ወይም ግምቱ ተመን ላይ ንጥል ለ ሽያጭ ዋጋ Validate
 DocType: Fee Schedule,Fee Schedule,ክፍያ ፕሮግራም
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,የአምድ መለያዎች
 DocType: Bank Transaction,Settled,የተስተካከለ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,መለኪያዎች።
@@ -6372,6 +6359,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,ፎርሙላ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,ተከታታይ #
 DocType: Material Request Plan Item,Required Quantity,የሚፈለግ ብዛት።
+DocType: Cash Flow Mapping Template,Template Name,የአብነት ስም
 DocType: Lab Test Template,Lab Test Template,የሙከራ መለኪያ አብነት
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},የሂሳብ ጊዜ ከ {0} ጋር ይደራረባል
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,የሽያጭ መለያ
@@ -6432,7 +6420,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-YYYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,ቼክ ቀን
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},መለያ {0}: የወላጅ መለያ {1} ኩባንያ የእርሱ ወገን አይደለም: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,በተሳካ ሁኔታ ከዚህ ድርጅት ጋር የተያያዙ ሁሉም ግብይቶች ተሰርዟል!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,ቀን ላይ እንደ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,ቀን ላይ እንደ
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,የምዝገባ ቀን
 DocType: Healthcare Settings,Out Patient SMS Alerts,ታካሚ የኤስኤምኤስ ማስጠንቀቂያዎች
@@ -6498,7 +6486,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,ጥያቄ
 DocType: Subscription,Trial Period End Date,የሙከራ ክፍለ ጊዜ መጨረሻ ቀን
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,{0} ገደብ አልፏል ጀምሮ authroized አይደለም
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,ከዚህ ውስጥ ውሂብ ማስገባት ይጀምሩ
 DocType: Serial No,Asset Status,የንብረት ሁኔታ
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),ከዲዛይነር ጭነት (ኦ ዲ ኤ ሲ)
 DocType: Restaurant Order Entry,Restaurant Table,የምግብ ቤት ሰንጠረዥ
@@ -6724,7 +6711,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,ግ
 DocType: Contract,Party User,የጭፈራ ተጠቃሚ
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,ለ <b>{0}</b> ንብረቶች አልተፈጠሩም። ንብረት እራስዎ መፍጠር ይኖርብዎታል።
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',የቡድን በ «ኩባንያ &#39;ከሆነ ኩባንያ ባዶ ማጣሪያ ያዘጋጁ እባክዎ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,መለጠፍ ቀን ወደፊት ቀን ሊሆን አይችልም
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},የረድፍ # {0}: መለያ አይ {1} ጋር አይዛመድም {2} {3}
 DocType: Loan Repayment,Interest Payable,የወለድ ክፍያ
@@ -6959,7 +6945,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,አማካኝ ደረጃ
 DocType: Appointment,Appointment With,ቀጠሮ በ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ጠቅላላ የክፍያ መጠን በክፍያ ሠንጠረዥ ውስጥ ከትልቅ / ጠቅላላ ድምር ጋር መሆን አለበት
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,ተገኝነትን እንደ ምልክት ያድርጉ <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",“በደንበኞች የቀረበ ንጥል” የዋጋ ምጣኔ ሊኖረው አይችልም ፡፡
 DocType: Subscription Plan Detail,Plan,ዕቅድ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,አጠቃላይ የሒሳብ መዝገብ መሠረት የባንክ መግለጫ ቀሪ
@@ -7648,7 +7633,6 @@ DocType: Item Customer Detail,Item Customer Detail,ንጥል የደንበኛ ዝ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},ከፍተኛ የደመወዝ መጠን {0} ከ {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,ጠቅላላ የተመደበ ቅጠሎች ጊዜ ውስጥ ቀኖች በላይ ናቸው
 DocType: Linked Soil Analysis,Linked Soil Analysis,የተገናኙ የአፈር ትንታኔ
-DocType: Pricing Rule,Percentage,በመቶ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,ንጥል {0} ከአክሲዮን ንጥል መሆን አለበት
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,የሂደት መጋዘን ውስጥ ነባሪ ሥራ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","ለ {0} የጊዜ ሰሌዳዎች መደቦች ተደራርበው, በተደጋጋሚ የተደባዙ ስሎዶች ከተዘለሉ በኋላ መቀጠል ይፈልጋሉ?"

erpnext/translations/ar.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,حجز موعد ا
 DocType: Work Order Operation,Work In Progress,التقدم في العمل
 DocType: Leave Control Panel,Branch (optional),فرع (اختياري)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,يرجى تحديد التاريخ
-DocType: Item Price,Minimum Qty ,الكمية الدنيا
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,الكمية الدنيا
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},تكرار BOM: {0} لا يمكن أن يكون تابعًا لـ {1}
 DocType: Finance Book,Finance Book,كتاب المالية
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,قائمة العطلات
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,الحساب الأصل {0} غير موجود
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,مراجعة والعمل
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},هذا الموظف لديه بالفعل سجل بنفس الطابع الزمني. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,محاسب
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,صن
 DocType: Exchange Rate Revaluation Account,Gain/Loss,الربح / الخسارة
 DocType: Crop,Perennial,الدائمة
 DocType: Program,Is Published,يتم نشر
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,إظهار ملاحظات التسليم
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",للسماح بزيادة الفواتير ، حدّث "Over Billing Allowance" في إعدادات الحسابات أو العنصر.
 DocType: Patient Appointment,Procedure,إجراء
 DocType: Accounts Settings,Use Custom Cash Flow Format,استخدم تنسيق التدفق النقدي المخصص
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,عوامل الخطر
 DocType: Patient,Occupational Hazards and Environmental Factors,المخاطر المهنية والعوامل البيئية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,تم إنشاء إدخالات المخزون بالفعل لأمر العمل
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,كود الصنف> مجموعة الصنف> العلامة التجارية
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,انظر الطلبات السابقة
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} محادثات
 DocType: Vital Signs,Respiratory rate,معدل التنفس
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,حدث خطأ أثناء عملية التحديث
 DocType: Restaurant Reservation,Restaurant Reservation,حجز المطعم
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,البنود الخاصة بك
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,مورد> نوع المورد
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,تجهيز العروض
 DocType: Payment Entry Deduction,Payment Entry Deduction,دفع الاشتراك خصم
 DocType: Service Level Priority,Service Level Priority,أولوية مستوى الخدمة
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,يرجى تحديد الشركة وتاريخ النشر للحصول على إدخالات
 DocType: Asset,Maintenance,صيانة
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,الحصول على من لقاء المريض
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},معامل تحويل UOM ({0} -> {1}) غير موجود للعنصر: {2}
 DocType: Subscriber,Subscriber,مكتتب
 DocType: Item Attribute Value,Item Attribute Value,قيمة مواصفة الصنف
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,يجب أن يكون صرف العملات ساريًا للشراء أو البيع.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,معدل مع الهامش
 DocType: Purchase Invoice,Is Return (Debit Note),هو العودة (ملاحظة الخصم)
 DocType: Workstation,Wages,أجور
 DocType: Asset Maintenance,Maintenance Manager Name,اسم مدير الصيانة
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,المعاملات ضد الشركة موجودة بالفعل!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,طلب موقع
 DocType: Agriculture Task,Urgent,عاجل
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,جلب السجلات ......
@@ -2653,7 +2647,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,قد يكون مصطلح الدفع في الصف {0} مكررا.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),الزراعة (تجريبي)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,قائمة بمحتويات الشحنة
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد> الإعدادات> سلسلة التسمية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,ايجار مكتب
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,إعدادات العبارة  SMS
 DocType: Disease,Common Name,اسم شائع
@@ -2819,7 +2812,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},الاجازات خصصت بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,لا توجد عناصر لحزمة
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,فقط ملفات .csv و .xlsx مدعومة حاليًا
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية> إعدادات الموارد البشرية
 DocType: Shipping Rule Condition,From Value,من القيمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
 DocType: Loan,Repayment Method,طريقة السداد
@@ -4067,7 +4059,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,مطلوب في
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips",إذا تم تحديده ، يقوم بإخفاء وتعطيل حقل Rounded Total في قسائم الرواتب
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,هذا هو الإزاحة الافتراضية (أيام) لتاريخ التسليم في أوامر المبيعات. الإزاحة الاحتياطية هي 7 أيام من تاريخ وضع الطلب.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد> سلسلة الترقيم
 DocType: Rename Tool,File to Rename,إعادة تسمية الملف
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},الرجاء تحديد قائمة المواد للبند في الصف {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,جلب تحديثات الاشتراك
@@ -4702,7 +4693,6 @@ DocType: Healthcare Service Unit Type,Item Details,بيانات الصنف
 DocType: Cash Flow Mapping,Is Finance Cost,تكلفة التمويل
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,تم وضع علامة حضور للموظف {0} بالفعل
 DocType: Packing Slip,If more than one package of the same type (for print),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم> إعدادات التعليم
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,يرجى تعيين العملاء الافتراضي في إعدادات المطعم
 ,Salary Register,راتب التسجيل
 DocType: Company,Default warehouse for Sales Return,المستودع الافتراضي لعائد المبيعات
@@ -4973,7 +4963,6 @@ DocType: Item,Inspection Required before Purchase,التفتيش المطلوب
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,الأنشطة المعلقة
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,إنشاء اختبار معملي
 DocType: Patient Appointment,Reminded,ذكر
-DocType: Homepage Section,Cards,بطاقات
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,عرض الرسم البياني للحسابات
 DocType: Chapter Member,Chapter Member,عضو الفصل
 DocType: Material Request Plan Item,Minimum Order Quantity,أقل كمية ممكن طلبها
@@ -4991,7 +4980,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,التواريخ المستقبلية غير مسموح بها
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,يجب أن يكون تاريخ التسليم المتوقع بعد تاريخ أمر المبيعات
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,مستوى اعادة الطلب
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,نمودج  دليل الحسابات
+DocType: Company,Chart Of Accounts Template,نمودج  دليل الحسابات
 DocType: Attendance,Attendance Date,تاريخ الحضور
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},يجب تمكين مخزون التحديث لفاتورة الشراء {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},سعر الصنف محدث ل{0} في قائمة الأسعار {1}
@@ -5556,8 +5545,6 @@ DocType: Installation Note,Installation Date,تثبيت تاريخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,مشاركة دفتر الأستاذ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,تم إنشاء فاتورة المبيعات {0}
 DocType: Employee,Confirmation Date,تاريخ التأكيد
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 DocType: Inpatient Occupancy,Check Out,الدفع
 DocType: C-Form,Total Invoiced Amount,إجمالي مبلغ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,الكمية الادنى لايمكن ان تكون اكبر من الكمية الاعلى
@@ -5764,7 +5751,6 @@ DocType: Employee,Prefered Contact Email,البريد الإلكتروني ال
 DocType: Cheque Print Template,Cheque Width,عرض الشيك
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,تحقق من سعر البيع للالبند ضد سعر الشراء أو معدل التقييم
 DocType: Fee Schedule,Fee Schedule,جدول التكاليف
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,تسميات الأعمدة:
 DocType: Bank Transaction,Settled,تسوية
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,سيس
 DocType: Quality Feedback,Parameters,المعلمات
@@ -6438,6 +6424,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,صيغة
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,المسلسل #
 DocType: Material Request Plan Item,Required Quantity,الكمية المطلوبة
+DocType: Cash Flow Mapping Template,Template Name,اسم القالب
 DocType: Lab Test Template,Lab Test Template,قالب اختبار المختبر
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},فترة المحاسبة تتداخل مع {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,حساب مبيعات
@@ -6498,7 +6485,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},الحساب {0}: الحساب الرئيسي {1} لا ينتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,كما هو بتاريخ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,كما هو بتاريخ
 DocType: Additional Salary,HR,الموارد البشرية
 DocType: Course Enrollment,Enrollment Date,تاريخ التسجيل
 DocType: Healthcare Settings,Out Patient SMS Alerts,خارج التنبيهات سمز المريض
@@ -6564,7 +6551,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,لغز
 DocType: Subscription,Trial Period End Date,تاريخ انتهاء الفترة التجريبية
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,غير مخول عندما {0} تتجاوز الحدود
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,ابدأ في إدخال البيانات من هنا:
 DocType: Serial No,Asset Status,حالة الأصول
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),عبر البعد الشحن (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,طاولة المطعم
@@ -6791,7 +6777,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,إر
 DocType: Contract,Party User,مستخدم الحزب
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,الأصول التي لم يتم تكوينها لـ <b>{0}</b> . سيكون عليك إنشاء أصل يدويًا.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',الرجاء تعيين فلتر الشركة فارغا إذا كانت المجموعة بي هي &#39;كومباني&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,تاريخ النشر لا يمكن أن يكون تاريخ مستقبلي
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: الرقم التسلسلي {1} لا يتطابق مع {2} {3}
 DocType: Loan Repayment,Interest Payable,الفوائد المستحقة الدفع
@@ -7026,7 +7011,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,المعدل المتوسط
 DocType: Appointment,Appointment With,موعد مع
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,علامة الحضور كما <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""الأصناف المقدمة من العملاء"" لا يمكن ان تحتوي على تكلفة"
 DocType: Subscription Plan Detail,Plan,خطة
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,كشف رصيد الحساب المصرفي وفقا لدفتر الأستاذ العام
@@ -7721,7 +7705,6 @@ DocType: Item Customer Detail,Item Customer Detail,تفاصيل العميل ل
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},أقصى مبلغ لمبلغ الموظف {0} يتجاوز {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,مجموع الأوراق المخصصة هي أكثر من أيام في الفترة
 DocType: Linked Soil Analysis,Linked Soil Analysis,تحليل التربة المرتبط
-DocType: Pricing Rule,Percentage,النسبة المئوية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,البند {0} يجب أن يكون البند الأسهم
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,افتراضي العمل في مستودع التقدم
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",جداول التداخلات {0} ، هل تريد المتابعة بعد تخطي الفتحات المتراكبة؟

erpnext/translations/bg.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Слот за ре
 DocType: Work Order Operation,Work In Progress,Незавършено производство
 DocType: Leave Control Panel,Branch (optional),Клон (незадължително)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,"Моля, изберете дата"
-DocType: Item Price,Minimum Qty ,Минимален брой
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Минимален брой
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM рекурсия: {0} не може да бъде дете на {1}
 DocType: Finance Book,Finance Book,Финансова книга
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Списък на празиниците
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Родителският акаунт {0} не съществува
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Преглед и действие
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Този служител вече има дневник със същата времева марка. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Счетоводител
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Пе
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Печалба / загуба
 DocType: Crop,Perennial,целогодишен
 DocType: Program,Is Published,Издава се
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Показване на бележки за доставка
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","За да разрешите над таксуване, актуализирайте „Над надбавка за фактуриране“ в Настройки на акаунти или Елемент."
 DocType: Patient Appointment,Procedure,процедура
 DocType: Accounts Settings,Use Custom Cash Flow Format,Използвайте персонализиран формат на паричен поток
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Рискови фактори
 DocType: Patient,Occupational Hazards and Environmental Factors,Професионални опасности и фактори на околната среда
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Вече се създават записи за поръчка за работа
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Код на артикула> Група артикули> Марка
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Вижте минали поръчки
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} разговори
 DocType: Vital Signs,Respiratory rate,Респираторна скорост
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Възникна грешка по време на процеса на актуализиране
 DocType: Restaurant Reservation,Restaurant Reservation,Ресторант Резервация
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Вашите вещи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Доставчик> Тип доставчик
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Предложение за писане
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плащането - отстъпка/намаление
 DocType: Service Level Priority,Service Level Priority,Приоритет на нивото на услугата
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Моля, изберете Фирма и дата на публикуване, за да получавате записи"
 DocType: Asset,Maintenance,Поддръжка
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Излез от срещата с пациента
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Коефициент на конверсия на UOM ({0} -> {1}) не е намерен за елемент: {2}
 DocType: Subscriber,Subscriber,абонат
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибут - Стойност
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Валутната обмяна трябва да бъде приложима при закупуване или продажба.
@@ -1936,7 +1931,6 @@ DocType: Sales Invoice Item,Rate With Margin,Оцени с марджин
 DocType: Purchase Invoice,Is Return (Debit Note),Връща се (дебитна бележка)
 DocType: Workstation,Wages,Заплати
 DocType: Asset Maintenance,Maintenance Manager Name,Име на мениджъра на поддръжката
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Сделките срещу компанията вече съществуват!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Заявка на сайт
 DocType: Agriculture Task,Urgent,Спешно
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Извличане на записи ......
@@ -2633,7 +2627,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Срокът за плащане на ред {0} е вероятно дубликат.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Селското стопанство (бета)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Приемо-предавателен протокол
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка> Настройки> Наименуване на серия"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Настройки Setup SMS Gateway
 DocType: Disease,Common Name,Често срещано име
@@ -2799,7 +2792,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Листата Разпределен успешно в продължение на {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Няма елементи за опаковане
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Понастоящем се поддържат само .csv и .xlsx файлове
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси> Настройки за човешки ресурси"
 DocType: Shipping Rule Condition,From Value,От стойност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Произвеждано количество е задължително
 DocType: Loan,Repayment Method,Възстановяване Метод
@@ -4046,7 +4038,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Необходим на
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ако е поставено отметка, скрива и деактивира поле Окръглена обща стойност в фишовете за заплати"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Това е компенсиране по подразбиране (дни) за датата на доставка в поръчки за продажби. Резервното компенсиране е 7 дни от датата на поставяне на поръчката.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,"Моля, настройте номерацията на сериите за присъствие чрез настройка> серия от номерация"
 DocType: Rename Tool,File to Rename,Файл за Преименуване
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Извличане на актуализации на абонаментите
@@ -4649,7 +4640,6 @@ DocType: Healthcare Service Unit Type,Item Details,Подробности за
 DocType: Cash Flow Mapping,Is Finance Cost,Финансовата цена е
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повече от един пакет от същия тип (за печат)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,"Моля, настройте системата за именуване на инструктори в Образование> Настройки за образование"
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,"Моля, задайте клиент по подразбиране в настройките на ресторанта"
 ,Salary Register,Заплата Регистрирайте се
 DocType: Company,Default warehouse for Sales Return,По подразбиране склад за връщане на продажби
@@ -4920,7 +4910,6 @@ DocType: Item,Inspection Required before Purchase,Инспекция е задъ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Предстоящите дейности
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Създайте лабораторен тест
 DocType: Patient Appointment,Reminded,Напомнено
-DocType: Homepage Section,Cards,карти
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Преглед на плана на сметките
 DocType: Chapter Member,Chapter Member,Член на главата
 DocType: Material Request Plan Item,Minimum Order Quantity,Минимално Количество за Поръчка
@@ -4938,7 +4927,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Бъдещите дати не са разрешени
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Очакваната дата на доставка трябва да бъде след датата на поръчката за продажба
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Пренареждане Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Сметкоплан - Шаблон
+DocType: Company,Chart Of Accounts Template,Сметкоплан - Шаблон
 DocType: Attendance,Attendance Date,Присъствие Дата
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Актуализирането на запас трябва да бъде разрешено за фактурата за покупка {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Елемент Цена актуализиран за {0} в Ценовата листа {1}
@@ -5503,8 +5492,6 @@ DocType: Installation Note,Installation Date,Дата на инсталация
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Акционерна книга
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Създадена е фактура за продажба {0}
 DocType: Employee,Confirmation Date,Потвърждение Дата
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Моля, изтрийте Служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 DocType: Inpatient Occupancy,Check Out,Разгледайте
 DocType: C-Form,Total Invoiced Amount,Общо Сума по фактура
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Минималното количество не може да бъде по-голяма от максималното количество
@@ -5711,7 +5698,6 @@ DocType: Employee,Prefered Contact Email,Предпочитан имейл за
 DocType: Cheque Print Template,Cheque Width,Чек Ширина
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Валидиране на продажна цена за позиция срещу процент за закупуване или цена по оценка
 DocType: Fee Schedule,Fee Schedule,График за такса
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Етикети на колоните:
 DocType: Bank Transaction,Settled,установен
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,данък
 DocType: Quality Feedback,Parameters,Параметри
@@ -6385,6 +6371,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,формула
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Необходимо количество
+DocType: Cash Flow Mapping Template,Template Name,Име на шаблона
 DocType: Lab Test Template,Lab Test Template,Лабораторен тестов шаблон
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Счетоводният период се припокрива с {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Профил за продажби
@@ -6445,7 +6432,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,"Успешно изтрити всички транзакции, свързани с тази компания!"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Както по Дата
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Както по Дата
 DocType: Additional Salary,HR,ЧР
 DocType: Course Enrollment,Enrollment Date,Записван - Дата
 DocType: Healthcare Settings,Out Patient SMS Alerts,Извън SMS съобщения за пациента
@@ -6511,7 +6498,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,викторина
 DocType: Subscription,Trial Period End Date,Крайна дата на пробния период
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Не authroized тъй {0} надхвърля границите
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Започнете да въвеждате данни от тук:
 DocType: Serial No,Asset Status,Състояние на активите
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Различни товари (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Ресторант Маса
@@ -6737,7 +6723,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Из
 DocType: Contract,Party User,Потребител на партия
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Активите не са създадени за <b>{0}</b> . Ще трябва да създадете актив ръчно.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Моля, поставете фирмения филтър празен, ако Group By е &quot;Company&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Публикуване Дата не може да бъде бъдеща дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
 DocType: Loan Repayment,Interest Payable,Дължими лихви
@@ -6972,7 +6957,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Средна цена
 DocType: Appointment,Appointment With,Назначение С
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общата сума за плащане в График на плащанията трябва да е равна на Голямо / Закръглено Общо
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Отбележете присъствието като <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","„Предмет, предоставен от клиента“ не може да има процент на оценка"
 DocType: Subscription Plan Detail,Plan,план
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Банково извлечение по Главна книга
@@ -7663,7 +7647,6 @@ DocType: Item Customer Detail,Item Customer Detail,Клиентска Позиц
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Максималната стойност на доходите на служител {0} надвишава {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Общо отпуснати листа са повече от дните през периода
 DocType: Linked Soil Analysis,Linked Soil Analysis,Свързан анализ на почвите
-DocType: Pricing Rule,Percentage,Процент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Позиция {0} трябва да бъде позиция със следене на наличности
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Склад за незав.производство по подразбиране
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Графики за припокриване на {0}, искате ли да продължите, след като прескочите припокритите слотове?"

erpnext/translations/bn.csv

@@ -167,11 +167,10 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,অ্যাপয
 DocType: Work Order Operation,Work In Progress,কাজ চলছে
 DocType: Leave Control Panel,Branch (optional),শাখা (alচ্ছিক)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,দয়া করে তারিখ নির্বাচন
-DocType: Item Price,Minimum Qty ,ন্যূনতম Qty
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,ন্যূনতম Qty
 DocType: Finance Book,Finance Book,ফাইন্যান্স বুক
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,ছুটির তালিকা
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,প্যারেন্ট অ্যাকাউন্ট {0} বিদ্যমান নেই
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,পর্যালোচনা এবং কর্ম
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},এই কর্মচারীর ইতিমধ্যে একই টাইমস্ট্যাম্পের একটি লগ রয়েছে {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,হিসাবরক্ষক
@@ -243,7 +242,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,অ
 DocType: Exchange Rate Revaluation Account,Gain/Loss,লাভ ক্ষতি
 DocType: Crop,Perennial,বহুবর্ষজীবী
 DocType: Program,Is Published,প্রকাশিত হয়
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,বিতরণ নোটগুলি প্রদর্শন করুন
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",অতিরিক্ত বিলিংয়ের অনুমতি দেওয়ার জন্য অ্যাকাউন্টস সেটিংস বা আইটেমটিতে "ওভার বিলিং ভাতা" আপডেট করুন।
 DocType: Patient Appointment,Procedure,কার্যপ্রণালী
 DocType: Accounts Settings,Use Custom Cash Flow Format,কাস্টম ক্যাশ ফ্লো বিন্যাস ব্যবহার করুন
@@ -963,7 +961,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,ঝুঁকির কারণ
 DocType: Patient,Occupational Hazards and Environmental Factors,পেশাগত ঝুঁকি এবং পরিবেশগত ফ্যাক্টর
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,স্টক তালিকাগুলি ইতিমধ্যে ওয়ার্ক অর্ডারের জন্য তৈরি করা হয়েছে
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,আইটেম কোড> আইটেম গ্রুপ> ব্র্যান্ড
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,অতীত আদেশ দেখুন
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} কথোপকথন
 DocType: Vital Signs,Respiratory rate,শ্বাসপ্রশ্বাসের হার
@@ -1116,7 +1113,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,আপডেট প্রক্রিয়ার সময় একটি ত্রুটি ঘটেছে
 DocType: Restaurant Reservation,Restaurant Reservation,রেস্টুরেন্ট রিজার্ভেশন
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,আপনার আইটেম
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,সরবরাহকারী> সরবরাহকারী প্রকার
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,প্রস্তাবনা লিখন
 DocType: Payment Entry Deduction,Payment Entry Deduction,পেমেন্ট এণ্ট্রি সিদ্ধান্তগ্রহণ
 DocType: Service Level Priority,Service Level Priority,পরিষেবা স্তরের অগ্রাধিকার
@@ -1411,7 +1407,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,অনুগ্রহ করে এন্ট্রি পাওয়ার জন্য কোম্পানি এবং পোস্টিং তারিখ নির্বাচন করুন
 DocType: Asset,Maintenance,রক্ষণাবেক্ষণ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,রোগীর এনকাউন্টার থেকে পান
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -> {1}) আইটেমটির জন্য পাওয়া যায় নি: {2}
 DocType: Subscriber,Subscriber,গ্রাহক
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,মুদ্রা বিনিময় কেনা বা বিক্রয়ের জন্য প্রযোজ্য হবে।
@@ -1906,7 +1901,6 @@ DocType: Sales Invoice Item,Rate With Margin,মার্জিন সঙ্গ
 DocType: Purchase Invoice,Is Return (Debit Note),রিটার্ন (ডেবিট নোট)
 DocType: Workstation,Wages,মজুরি
 DocType: Asset Maintenance,Maintenance Manager Name,রক্ষণাবেক্ষণ ম্যানেজার নাম
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,কোম্পানির বিরুদ্ধে লেনদেন ইতিমধ্যে বিদ্যমান!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,অনুরোধ সাইট
 DocType: Agriculture Task,Urgent,জরুরী
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,রেকর্ড আনছে ......
@@ -2750,7 +2744,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,কোনও আইটেম প্যাক
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,বর্তমানে কেবলমাত্র .csv এবং .xlsx ফাইলগুলি সমর্থিত
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,মানব সম্পদ> এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
 DocType: Loan,Repayment Method,পরিশোধ পদ্ধতি
@@ -3968,7 +3961,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,প্রয়োজনীয় উপর
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","যদি চেক করা থাকে, বেতন স্লিপগুলিতে গোলাকার মোট ক্ষেত্রটি লুকায় ও অক্ষম করে"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,বিক্রয় অর্ডারে বিতরণ তারিখের জন্য এটি ডিফল্ট অফসেট (দিন)। অর্ডার প্লেসমেন্টের তারিখ থেকে ফ্যালব্যাক অফসেটটি 7 দিন।
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,দয়া করে সেটআপ> নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,সদস্যতা আপডেটগুলি আনুন
@@ -4564,7 +4556,6 @@ DocType: Healthcare Service Unit Type,Item Details,আইটেম বিবর
 DocType: Cash Flow Mapping,Is Finance Cost,অর্থ খরচ হয়
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
 DocType: Packing Slip,If more than one package of the same type (for print),তাহলে একই ধরনের একাধিক বাক্স (প্রিন্ট জন্য)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,অনুগ্রহ করে শিক্ষা> শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,রেস্টুরেন্ট সেটিংস এ ডিফল্ট গ্রাহক সেট করুন
 ,Salary Register,বেতন নিবন্ধন
 DocType: Company,Default warehouse for Sales Return,বিক্রয় ফেরতের জন্য ডিফল্ট গুদাম
@@ -4829,7 +4820,6 @@ DocType: Item,Inspection Required before Purchase,ইন্সপেকশন
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,ল্যাব টেস্ট তৈরি করুন
 DocType: Patient Appointment,Reminded,মনে করানো
-DocType: Homepage Section,Cards,তাস
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,অ্যাকাউন্টের চার্ট দেখুন
 DocType: Chapter Member,Chapter Member,অধ্যায় সদস্য
 DocType: Material Request Plan Item,Minimum Order Quantity,ন্যূনতম চাহিদার পরিমাণ
@@ -4846,7 +4836,7 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Newspaper Publishe
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,ভবিষ্যতের তারিখগুলি অনুমোদিত নয়
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,প্রত্যাশিত ডেলিভারি তারিখ বিক্রয় আদেশ তারিখের পরে হওয়া উচিত
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,পুনর্বিন্যাস স্তর
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,একাউন্টস টেমপ্লেটের চার্ট
+DocType: Company,Chart Of Accounts Template,একাউন্টস টেমপ্লেটের চার্ট
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},আপডেট স্টক ক্রয় বিনিময় জন্য সক্ষম করা আবশ্যক {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},আইটেম দাম {0} মূল্য তালিকা জন্য আপডেট {1}
@@ -5405,8 +5395,6 @@ DocType: Installation Note,Installation Date,ইনস্টলেশনের
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,লেজার শেয়ার করুন
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,সেলস ইনভয়েস {0} তৈরি করেছে
 DocType: Employee,Confirmation Date,নিশ্চিতকরণ তারিখ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","এই নথিটি বাতিল করতে দয়া করে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> delete মুছুন"
 DocType: Inpatient Occupancy,Check Out,চেক আউট
 DocType: C-Form,Total Invoiced Amount,মোট invoiced পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,ন্যূনতম Qty সর্বোচ্চ Qty তার চেয়ে অনেক বেশী হতে পারে না
@@ -5608,7 +5596,6 @@ DocType: Employee,Prefered Contact Email,Prefered যোগাযোগ ইম
 DocType: Cheque Print Template,Cheque Width,চেক প্রস্থ
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,যাচাই করে নিন বিক্রয় মূল্য ক্রয় হার বা মূল্যনির্ধারণ হার বিরুদ্ধে আইটেম জন্য
 DocType: Fee Schedule,Fee Schedule,ফি সময়সূচী
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,কলাম লেবেল:
 DocType: Bank Transaction,Settled,স্থায়ী
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,উপকর
 DocType: Quality Feedback,Parameters,পরামিতি
@@ -6273,6 +6260,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,সূত্র
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,সিরিয়াল #
 DocType: Material Request Plan Item,Required Quantity,প্রয়োজনীয় পরিমাণ
+DocType: Cash Flow Mapping Template,Template Name,টেম্পলেট নাম
 DocType: Lab Test Template,Lab Test Template,ল্যাব টেস্ট টেমপ্লেট
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,বিক্রয় অ্যাকাউন্ট
 DocType: Purchase Invoice Item,Total Weight,সম্পূর্ণ ওজন
@@ -6332,7 +6320,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,আজকের তারিখে
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,আজকের তারিখে
 DocType: Additional Salary,HR,এইচআর
 DocType: Course Enrollment,Enrollment Date,তালিকাভুক্তি তারিখ
 DocType: Healthcare Settings,Out Patient SMS Alerts,আউট রোগীর এসএমএস সতর্কতা
@@ -6397,7 +6385,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,ব্যঙ্গ
 DocType: Subscription,Trial Period End Date,ট্রায়াল সময়কাল শেষ তারিখ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,"{0} সীমা অতিক্রম করে, যেহেতু authroized না"
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,এখান থেকে ডেটা প্রবেশ করা শুরু করুন:
 DocType: Serial No,Asset Status,সম্পদ স্থিতি
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),ডাইমেনশনাল কার্গো ওভার (ওডিসি)
 DocType: Restaurant Order Entry,Restaurant Table,রেস্টুরেন্ট টেবিল
@@ -6616,7 +6603,6 @@ apps/erpnext/erpnext/buying/report/purchase_analytics/purchase_analytics.js,base
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,পর্যালোচনা জমা দিন
 DocType: Contract,Party User,পার্টি ব্যবহারকারী
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',দয়া করে কোম্পানির ফাঁকা ফিল্টার সেট করুন যদি একদল &#39;কোম্পানি&#39; হল
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,পোস্টিং তারিখ ভবিষ্যতে তারিখে হতে পারে না
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
 DocType: Loan Repayment,Interest Payable,প্রদেয় সুদ
@@ -6850,7 +6836,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,গড় হার
 DocType: Appointment,Appointment With,সাথে নিয়োগ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,পেমেন্ট শংসাপত্রের মোট পরিশোধের পরিমাণ গ্র্যান্ড / গোলাকার মোট সমান হওয়া আবশ্যক
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,হিসাবে উপস্থিতি চিহ্নিত করুন <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;গ্রাহক সরবরাহিত আইটেম&quot; এর মূল্য মূল্য হতে পারে না
 DocType: Subscription Plan Detail,Plan,পরিকল্পনা
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,জেনারেল লেজার অনুযায়ী ব্যাংক ব্যালেন্সের
@@ -7526,7 +7511,6 @@ DocType: Item Customer Detail,Item Customer Detail,আইটেম গ্রা
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},কর্মীর সর্বাধিক সুবিধা পরিমাণ {0} অতিক্রম করে {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,সর্বমোট পাতার সময়ের মধ্যে দিনের বেশী হয়
 DocType: Linked Soil Analysis,Linked Soil Analysis,সংযুক্ত মৃত্তিকা বিশ্লেষণ
-DocType: Pricing Rule,Percentage,শতকরা হার
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,আইটেম {0} একটি স্টক আইটেম হতে হবে
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,প্রগতি গুদাম ডিফল্ট কাজ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","{0} ওভারল্যাপের জন্য সময়সূচী, আপনি কি ওভারল্যাপেড স্লটগুলি বাদ দিয়ে এগিয়ে যেতে চান?"

erpnext/translations/bs.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Slotovi za rezervac
 DocType: Work Order Operation,Work In Progress,Radovi u toku
 DocType: Leave Control Panel,Branch (optional),Podružnica (neobavezno)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Molimo izaberite datum
-DocType: Item Price,Minimum Qty ,Minimalni količina
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimalni količina
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM rekurzija: {0} ne može biti dijete od {1}
 DocType: Finance Book,Finance Book,Finansijska knjiga
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Lista odmora
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Roditeljski račun {0} ne postoji
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pregled i radnja
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ovaj zaposlenik već ima dnevnik sa istim vremenskim žigom. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovođa
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,miro
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Dobit / gubitak
 DocType: Crop,Perennial,Višegodišnje
 DocType: Program,Is Published,Objavljeno je
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Prikaži bilješke o isporuci
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Da biste omogućili prekomerno naplaćivanje, ažurirajte „Nadoplatu za naplatu“ u Postavkama računa ili Stavka."
 DocType: Patient Appointment,Procedure,Procedura
 DocType: Accounts Settings,Use Custom Cash Flow Format,Koristite Custom Flow Flow Format
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Faktori rizika
 DocType: Patient,Occupational Hazards and Environmental Factors,Opasnosti po životnu sredinu i faktore zaštite životne sredine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Upis zaliha već je kreiran za radni nalog
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kod artikla> Grupa artikala> Marka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Pogledajte prošla naređenja
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} razgovora
 DocType: Vital Signs,Respiratory rate,Stopa respiratornih organa
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Došlo je do greške tokom procesa ažuriranja
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vaše predmete
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Dobavljač> vrsta dobavljača
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Entry Odbitak
 DocType: Service Level Priority,Service Level Priority,Prioritet na nivou usluge
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Molimo da odaberete Kompaniju i Datum objavljivanja da biste dobili unose
 DocType: Asset,Maintenance,Održavanje
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Izlazite iz susreta sa pacijentom
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor konverzije UOM ({0} -> {1}) nije pronađen za stavku: {2}
 DocType: Subscriber,Subscriber,Pretplatnik
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Menjanje mjenjača mora biti primjenjivo za kupovinu ili prodaju.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,Stopu sa margina
 DocType: Purchase Invoice,Is Return (Debit Note),Je povratak (obaveštenje o zaduživanju)
 DocType: Workstation,Wages,Plata
 DocType: Asset Maintenance,Maintenance Manager Name,Ime menadžera održavanja
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakcije protiv kompanije već postoje!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Podnošenje zahtjeva
 DocType: Agriculture Task,Urgent,Hitan
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Dohvaćanje zapisa ......
@@ -2653,7 +2647,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Rok plaćanja na redu {0} je možda duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Poljoprivreda (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Odreskom
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje> Podešavanja> Imenovanje serije
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,najam ureda
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Postavke Setup SMS gateway
 DocType: Disease,Common Name,Zajedničko ime
@@ -2819,7 +2812,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Nema stavki za omot
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Trenutno su podržane samo .csv i .xlsx datoteke
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima> HR postavke
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
 DocType: Loan,Repayment Method,otplata Način
@@ -4066,7 +4058,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Potrebna On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ako je označeno, sakriva i onemogućuje polje Zaokruženo ukupno u listićima plaće"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Ovo je zadani offset (dani) za datum isporuke u prodajnim nalozima. Ponovno nadoknađivanje je 7 dana od datuma slanja narudžbe.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje> Serija numeriranja
 DocType: Rename Tool,File to Rename,File da biste preimenovali
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Izvrši ažuriranje pretplate
@@ -4700,7 +4691,6 @@ DocType: Healthcare Service Unit Type,Item Details,Detalji artikla
 DocType: Cash Flow Mapping,Is Finance Cost,Da li je finansijski trošak
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje> Postavke obrazovanja
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Podesite podrazumevani kupac u podešavanjima restorana
 ,Salary Register,Plaća Registracija
 DocType: Company,Default warehouse for Sales Return,Zadano skladište za povraćaj prodaje
@@ -4971,7 +4961,6 @@ DocType: Item,Inspection Required before Purchase,Inspekcija Obavezno prije kupn
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Aktivnosti na čekanju
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Napravite laboratorijski test
 DocType: Patient Appointment,Reminded,Podsetio
-DocType: Homepage Section,Cards,Karte
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Pregled grafikona računa
 DocType: Chapter Member,Chapter Member,Član poglavlja
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimalna količina narudžbine
@@ -4989,7 +4978,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Dalji datumi nisu dozvoljeni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Očekivani datum isporuke treba da bude nakon datuma prodaje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Ponovno red Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontni plan Template
+DocType: Company,Chart Of Accounts Template,Kontni plan Template
 DocType: Attendance,Attendance Date,Gledatelja Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Ažuriranje zaliha mora biti omogućeno za fakturu za kupovinu {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
@@ -5554,8 +5543,6 @@ DocType: Installation Note,Installation Date,Instalacija Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Prodajna faktura {0} kreirana
 DocType: Employee,Confirmation Date,potvrda Datum
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Inpatient Occupancy,Check Out,Provjeri
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Kol ne može biti veći od Max Kol
@@ -5762,7 +5749,6 @@ DocType: Employee,Prefered Contact Email,Prefered Kontakt mail
 DocType: Cheque Print Template,Cheque Width,Ček Širina
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Potvrditi prodajna cijena za artikl protiv kupovine objekta ili Vrednovanje Rate
 DocType: Fee Schedule,Fee Schedule,naknada Raspored
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Oznake stupaca:
 DocType: Bank Transaction,Settled,Riješeni
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametri
@@ -6436,6 +6422,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,o
 DocType: Salary Component,Formula,formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Tražena količina
+DocType: Cash Flow Mapping Template,Template Name,template Name
 DocType: Lab Test Template,Lab Test Template,Lab test šablon
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodstveno razdoblje se preklapa sa {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Račun prodaje
@@ -6496,7 +6483,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kao i na datum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kao i na datum
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,upis Datum
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS upozorenja
@@ -6562,7 +6549,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Kviz
 DocType: Subscription,Trial Period End Date,Datum završetka probnog perioda
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Počnite unositi podatke odavde:
 DocType: Serial No,Asset Status,Status imovine
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restoran Stol
@@ -6789,7 +6775,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Submi
 DocType: Contract,Party User,Party User
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Sredstva nisu stvorena za <b>{0}</b> . Morat ćete stvoriti imovinu ručno.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Molimo podesite Company filter prazno ako Skupina Od je &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Datum knjiženja ne može biti u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
 DocType: Loan Repayment,Interest Payable,Kamata se plaća
@@ -7024,7 +7009,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Prosečna stopa
 DocType: Appointment,Appointment With,Sastanak sa
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupan iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / zaokruženom ukupno
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi prisustvo kao <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Predmet koji pruža klijent&quot; ne može imati stopu vrednovanja
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
@@ -7716,7 +7700,6 @@ DocType: Item Customer Detail,Item Customer Detail,Artikal - detalji kupca
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimalan iznos naknade zaposlenog {0} prelazi {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Ukupno izdvojene Listovi su više od nekoliko dana u razdoblju
 DocType: Linked Soil Analysis,Linked Soil Analysis,Linked soil analysis
-DocType: Pricing Rule,Percentage,postotak
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Rasporedi za {0} se preklapaju, da li želite da nastavite nakon preskakanja preklapanih slotova?"

erpnext/translations/ca.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Cites de reserva de
 DocType: Work Order Operation,Work In Progress,Treball en curs
 DocType: Leave Control Panel,Branch (optional),Oficina (opcional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Si us plau seleccioni la data
-DocType: Item Price,Minimum Qty ,Quantitat mínima
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Quantitat mínima
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Recursió de BOM: {0} no pot ser fill de {1}
 DocType: Finance Book,Finance Book,Llibre de finances
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Llista de vacances
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,El compte pare {0} no existeix
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisió i acció
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Aquest empleat ja té un registre amb la mateixa marca de temps. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Fons
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Guany / pèrdua
 DocType: Crop,Perennial,Perenne
 DocType: Program,Is Published,Es publica
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Mostra albarans de lliurament
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Per permetre la facturació excessiva, actualitzeu "Indemnització sobre facturació" a la configuració del compte o a l'element."
 DocType: Patient Appointment,Procedure,Procediment
 DocType: Accounts Settings,Use Custom Cash Flow Format,Utilitzeu el format de flux de caixa personalitzat
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Factors de risc
 DocType: Patient,Occupational Hazards and Environmental Factors,Riscos laborals i factors ambientals
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entrades de valors ja creades per a la comanda de treball
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Codi de l'article> Grup d'elements> Marca
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Consulteu ordres anteriors
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} converses
 DocType: Vital Signs,Respiratory rate,Taxa respiratòria
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,S'ha produït un error durant el procés d'actualització
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurants
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Els seus articles
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Proveïdor> Tipus de proveïdor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Redacció de propostes
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pagament Deducció d'entrada
 DocType: Service Level Priority,Service Level Priority,Prioritat de nivell de servei
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Seleccioneu Companyia i Data de publicació per obtenir entrades
 DocType: Asset,Maintenance,Manteniment
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Obtenir de Trobada de pacients
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Factor de conversió UOM ({0} -> {1}) no trobat per a l'element: {2}
 DocType: Subscriber,Subscriber,Subscriptor
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,L'intercanvi de divises ha de ser aplicable per a la compra o per a la venda.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,Amb la taxa de marge
 DocType: Purchase Invoice,Is Return (Debit Note),És retorn (Nota de dèbit)
 DocType: Workstation,Wages,Salari
 DocType: Asset Maintenance,Maintenance Manager Name,Nom del gestor de manteniment
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Les transaccions amb l'empresa ja existeixen.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Sol·licitant el lloc
 DocType: Agriculture Task,Urgent,Urgent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Recuperació de registres ......
@@ -2653,7 +2647,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,El termini de pagament a la fila {0} és possiblement un duplicat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Agricultura (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Llista de presència
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Configureu Naming Series per a {0} mitjançant Configuració> Configuració> Sèries de nom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 DocType: Disease,Common Name,Nom comú
@@ -2819,7 +2812,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,No hi ha articles per embalar
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,"Actualment, només són compatibles els fitxers .csv i .xlsx"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans> Configuració de recursos humans
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
 DocType: Loan,Repayment Method,Mètode d'amortització
@@ -4067,7 +4059,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Requerit Per
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Si es marca, amaga i inhabilita el camp Total arrodonit als traços de salari"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Aquest és el decalatge (dies) predeterminat de la data de lliurament a les comandes de venda. La compensació de retard és de 7 dies des de la data de col·locació de la comanda.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració> Sèries de numeració
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l'article a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Obteniu actualitzacions de subscripció
@@ -4702,7 +4693,6 @@ DocType: Healthcare Service Unit Type,Item Details,Detalls de l'article
 DocType: Cash Flow Mapping,Is Finance Cost,El cost financer
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
 DocType: Packing Slip,If more than one package of the same type (for print),Si més d'un paquet del mateix tipus (per impressió)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Configureu un sistema de nom de l’Instructor a Educació> Configuració d’educació
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Establiu el client predeterminat a la Configuració del restaurant
 ,Salary Register,salari Registre
 DocType: Company,Default warehouse for Sales Return,Magatzem per defecte del retorn de vendes
@@ -4973,7 +4963,6 @@ DocType: Item,Inspection Required before Purchase,Inspecció requerida abans de
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Activitats pendents
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Crea una prova de laboratori
 DocType: Patient Appointment,Reminded,Recordat
-DocType: Homepage Section,Cards,Targetes
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Veure el gràfic de comptes
 DocType: Chapter Member,Chapter Member,Membre del capítol
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantitat mínima de comanda
@@ -4991,7 +4980,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,No es permeten dates futures
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La data de lliurament prevista hauria de ser posterior a la data de la comanda de vendes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Nivell de Reabastecimiento
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Gràfic de la plantilla de Comptes
+DocType: Company,Chart Of Accounts Template,Gràfic de la plantilla de Comptes
 DocType: Attendance,Attendance Date,Assistència Data
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},L'actualització de valors ha de ser habilitada per a la factura de compra {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Article Preu s'actualitza per {0} de la llista de preus {1}
@@ -5556,8 +5545,6 @@ DocType: Installation Note,Installation Date,Data d'instal·lació
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Comparteix el compilador
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,S'ha creat la factura de vendes {0}
 DocType: Employee,Confirmation Date,Data de confirmació
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Elimineu l&#39;empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 DocType: Inpatient Occupancy,Check Out,Sortida
 DocType: C-Form,Total Invoiced Amount,Suma total facturada
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Quantitat mínima no pot ser major que Quantitat màxima
@@ -5764,7 +5751,6 @@ DocType: Employee,Prefered Contact Email,Correu electrònic de contacte preferid
 DocType: Cheque Print Template,Cheque Width,ample Xec
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar preu de venda per a l&#39;article contra la Tarifa de compra o taxa de valorització
 DocType: Fee Schedule,Fee Schedule,Llista de tarifes
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Etiquetes de columnes:
 DocType: Bank Transaction,Settled,Assentat
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cessar
 DocType: Quality Feedback,Parameters,Paràmetres
@@ -6439,6 +6425,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,V
 DocType: Salary Component,Formula,fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Quantitat necessària
+DocType: Cash Flow Mapping Template,Template Name,Nom de la plantilla
 DocType: Lab Test Template,Lab Test Template,Plantilla de prova de laboratori
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},El període de comptabilitat es superposa amb {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Compte de vendes
@@ -6499,7 +6486,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Com en la data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Com en la data
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Data d&#39;inscripció
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alertes SMS de pacients
@@ -6565,7 +6552,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Test
 DocType: Subscription,Trial Period End Date,Període de prova Data de finalització
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Comenceu a introduir dades des d&#39;aquí:
 DocType: Serial No,Asset Status,Estat d&#39;actius
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Càrrec a gran dimensió (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Taula de restaurants
@@ -6792,7 +6778,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Envie
 DocType: Contract,Party User,Usuari del partit
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Actius no creats per a <b>{0}</b> . Haureu de crear actius manualment.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Si us plau ajust empresa de filtres en blanc si és Agrupa per &#39;empresa&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Data d&#39;entrada no pot ser data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
 DocType: Loan Repayment,Interest Payable,Interessos a pagar
@@ -7027,7 +7012,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Tarifa mitjana
 DocType: Appointment,Appointment With,Cita amb
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;import total del pagament en el calendari de pagaments ha de ser igual a Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcar l&#39;assistència com <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;L&#39;element subministrat pel client&quot; no pot tenir un percentatge de valoració
 DocType: Subscription Plan Detail,Plan,Pla
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Equilibri extracte bancari segons Comptabilitat General
@@ -7719,7 +7703,6 @@ DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},La quantitat de benefici màxim de l&#39;empleat {0} supera {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Total de fulles assignats més de dia en el període
 DocType: Linked Soil Analysis,Linked Soil Analysis,Anàlisi del sòl enllaçat
-DocType: Pricing Rule,Percentage,percentatge
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Programes per a {0} superposicions, voleu continuar després de saltar les ranures superposades?"

erpnext/translations/cs.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Výherní automaty
 DocType: Work Order Operation,Work In Progress,Na cestě
 DocType: Leave Control Panel,Branch (optional),Větev (volitelné)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,"Prosím, vyberte datum"
-DocType: Item Price,Minimum Qty ,Minimální počet
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimální počet
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekurze kusovníku: {0} nemůže být dítě {1}
 DocType: Finance Book,Finance Book,Finanční kniha
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Seznam dovolené
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Nadřazený účet {0} neexistuje
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Přezkum a akce
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Tento zaměstnanec již má záznam se stejným časovým razítkem. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Účetní
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Penz
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Zisk / ztráta
 DocType: Crop,Perennial,Trvalka
 DocType: Program,Is Published,Je publikováno
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Zobrazit dodací listy
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Chcete-li povolit přeúčtování, aktualizujte položku „Příplatek za fakturaci“ v Nastavení účtů nebo v položce."
 DocType: Patient Appointment,Procedure,Postup
 DocType: Accounts Settings,Use Custom Cash Flow Format,Použijte formát vlastní peněžní toky
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Rizikové faktory
 DocType: Patient,Occupational Hazards and Environmental Factors,Pracovní nebezpečí a environmentální faktory
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Zápisy již vytvořené pro pracovní objednávku
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kód položky> Skupina položek> Značka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Zobrazit minulé objednávky
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} konverzací
 DocType: Vital Signs,Respiratory rate,Dechová frekvence
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Během procesu aktualizace došlo k chybě
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervace restaurace
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vaše položky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Dodavatel> Typ dodavatele
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukce
 DocType: Service Level Priority,Service Level Priority,Priorita úrovně služeb
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Zvolte prosím datum společnosti a datum odevzdání
 DocType: Asset,Maintenance,Údržba
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Získejte z setkání pacienta
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM konverzní faktor ({0} -> {1}) nebyl nalezen pro položku: {2}
 DocType: Subscriber,Subscriber,Odběratel
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Směnárna musí být platná pro nákup nebo pro prodej.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,Míra s marží
 DocType: Purchase Invoice,Is Return (Debit Note),Je Return (Debit Note)
 DocType: Workstation,Wages,Mzdy
 DocType: Asset Maintenance,Maintenance Manager Name,Název správce údržby
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakce proti společnosti již existují!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Žádající web
 DocType: Agriculture Task,Urgent,Naléhavý
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Načítání záznamů ......
@@ -2653,7 +2647,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Platba v řádku {0} je možná duplikát.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Zemědělství (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Balící list
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nastavte Naming Series pro {0} prostřednictvím Setup> Settings> Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Nastavení SMS brány
 DocType: Disease,Common Name,Běžné jméno
@@ -2819,7 +2812,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Dovolená úspěšně přidělena {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Žádné položky k balení
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Aktuálně jsou podporovány pouze soubory CSV a XLSX
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje> Nastavení lidských zdrojů
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 DocType: Loan,Repayment Method,splácení Metoda
@@ -4067,7 +4059,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Povinné On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Pokud je zaškrtnuto, skryje a zakáže pole Zaokrouhlený celkový počet v Salary Slips"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Toto je výchozí offset (dny) pro datum dodání v prodejních objednávkách. Náhradní kompenzace je 7 dní od data zadání objednávky.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení> Číslovací řady
 DocType: Rename Tool,File to Rename,Soubor k přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Načíst aktualizace předplatného
@@ -4702,7 +4693,6 @@ DocType: Healthcare Service Unit Type,Item Details,Položka Podrobnosti
 DocType: Cash Flow Mapping,Is Finance Cost,Jsou finanční náklady
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání> Nastavení vzdělávání
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Nastavte výchozího zákazníka v nastavení restaurace
 ,Salary Register,plat Register
 DocType: Company,Default warehouse for Sales Return,Výchozí sklad pro vrácení prodeje
@@ -4973,7 +4963,6 @@ DocType: Item,Inspection Required before Purchase,Inspekce Požadované před n
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Nevyřízené Aktivity
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Vytvořit laboratorní test
 DocType: Patient Appointment,Reminded,Připomenuto
-DocType: Homepage Section,Cards,Karty
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Zobrazit přehled účtů
 DocType: Chapter Member,Chapter Member,Člen kapitoly
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimální množství pro objednání
@@ -4991,7 +4980,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Budoucí data nejsou povolená
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Očekávaný termín dodání by měl být po datu objednávky
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Změna pořadí Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Účtový rozvrh šablony
+DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablony
 DocType: Attendance,Attendance Date,Účast Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Aktualizace akcií musí být povolena pro nákupní fakturu {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Položka Cena aktualizován pro {0} v Ceníku {1}
@@ -5555,8 +5544,6 @@ DocType: Installation Note,Installation Date,Datum instalace
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Sdílet knihu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Byla vytvořena prodejní faktura {0}
 DocType: Employee,Confirmation Date,Potvrzení Datum
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Chcete-li tento dokument zrušit, prosím odstraňte zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Inpatient Occupancy,Check Out,Překontrolovat
 DocType: C-Form,Total Invoiced Amount,Celkem Fakturovaná částka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
@@ -5763,7 +5750,6 @@ DocType: Employee,Prefered Contact Email,Preferovaný Kontaktní e-mail
 DocType: Cheque Print Template,Cheque Width,Šek Šířka
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Ověření prodejní ceny položky proti nákupní ceně nebo ocenění
 DocType: Fee Schedule,Fee Schedule,poplatek Plán
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Štítky sloupců:
 DocType: Bank Transaction,Settled,Usadil se
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametry
@@ -6437,6 +6423,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,o
 DocType: Salary Component,Formula,Vzorec
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Požadované množství
+DocType: Cash Flow Mapping Template,Template Name,Název šablony
 DocType: Lab Test Template,Lab Test Template,Šablona zkušebního laboratoře
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Účetní období se překrývá s {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Prodejní účet
@@ -6497,7 +6484,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Stejně jako u Date
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Stejně jako u Date
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,zápis Datum
 DocType: Healthcare Settings,Out Patient SMS Alerts,Upozornění na upozornění pacienta
@@ -6563,7 +6550,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Kviz
 DocType: Subscription,Trial Period End Date,Datum ukončení zkušebního období
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Začněte zadávat data odtud:
 DocType: Serial No,Asset Status,Stav majetku
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Rozměrný náklad (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurace Tabulka
@@ -6790,7 +6776,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Odesl
 DocType: Contract,Party User,Party Uživatel
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Aktiva nebyla vytvořena pro <b>{0}</b> . Budete muset vytvořit dílo ručně.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Nastavte filtr společnosti prázdný, pokud je Skupina By je &#39;Company&#39;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Vysílání datum nemůže být budoucí datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
 DocType: Loan Repayment,Interest Payable,Úroky splatné
@@ -7025,7 +7010,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Průměrné hodnocení
 DocType: Appointment,Appointment With,Schůzka s
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková částka platby v rozpisu plateb se musí rovnat hodnotě Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označit účast jako <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",„Položka poskytovaná zákazníkem“ nemůže mít sazbu ocenění
 DocType: Subscription Plan Detail,Plan,Plán
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Výpis z bankovního účtu zůstatek podle hlavní knihy
@@ -7717,7 +7701,6 @@ DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maximální výše příspěvku zaměstnance {0} přesahuje {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Celkové přidělené listy jsou více než dnů v období
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analýza propojené půdy
-DocType: Pricing Rule,Percentage,Procento
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Výchozí práci ve skladu Progress
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Plán pro překrytí {0}, chcete pokračovat po přeskočení přesahovaných slotů?"

erpnext/translations/da.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Aftaler Booking Slo
 DocType: Work Order Operation,Work In Progress,Varer i arbejde
 DocType: Leave Control Panel,Branch (optional),Gren (valgfri)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Vælg venligst dato
-DocType: Item Price,Minimum Qty ,Minimum antal
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimum antal
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM-rekursion: {0} kan ikke være barn af {1}
 DocType: Finance Book,Finance Book,Finans Bog
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Helligdagskalender
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Forældrekontoen {0} findes ikke
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Gennemgang og handling
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Denne medarbejder har allerede en log med det samme tidsstempel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Revisor
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Pens
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Gevinst / Tab
 DocType: Crop,Perennial,Perennial
 DocType: Program,Is Published,Udgives
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Vis leveringsnotater
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",For at tillade overfakturering skal du opdatere "Over faktureringsgodtgørelse" i Kontoindstillinger eller elementet.
 DocType: Patient Appointment,Procedure,Procedure
 DocType: Accounts Settings,Use Custom Cash Flow Format,Brug Custom Cash Flow Format
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Risikofaktorer
 DocType: Patient,Occupational Hazards and Environmental Factors,Arbejdsfarer og miljøfaktorer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Aktieindtægter, der allerede er oprettet til Arbejdsordre"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Varekode> Varegruppe> Mærke
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Se tidligere ordrer
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} samtaler
 DocType: Vital Signs,Respiratory rate,Respirationsfrekvens
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Der opstod en fejl under opdateringsprocessen
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservation
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Dine varer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Leverandør> Leverandørtype
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Forslag Skrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling indtastning Fradrag
 DocType: Service Level Priority,Service Level Priority,Prioritet på serviceniveau
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Vælg venligst Company og Posting Date for at få poster
 DocType: Asset,Maintenance,Vedligeholdelse
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Få fra Patient Encounter
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -> {1}) ikke fundet for varen: {2}
 DocType: Subscriber,Subscriber,abonnent
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valutaveksling skal være gældende for køb eller salg.
@@ -1936,7 +1931,6 @@ DocType: Sales Invoice Item,Rate With Margin,Vurder med margen
 DocType: Purchase Invoice,Is Return (Debit Note),Er retur (debit note)
 DocType: Workstation,Wages,Løn
 DocType: Asset Maintenance,Maintenance Manager Name,Maintenance Manager Navn
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Der findes allerede transaktioner mod virksomheden!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Anmoder om websted
 DocType: Agriculture Task,Urgent,Hurtigst muligt
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Henter poster ......
@@ -2633,7 +2627,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Betalingsperioden i række {0} er muligvis et duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Landbrug (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakkeseddel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Angiv Naming Series for {0} via Setup> Settings> Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
 DocType: Disease,Common Name,Almindeligt navn
@@ -2799,7 +2792,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Fravær blev succesfuldt tildelt til {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Ingen varer at pakke
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Kun .csv- og .xlsx-filer understøttes i øjeblikket
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource> HR-indstillinger
 DocType: Shipping Rule Condition,From Value,Fra Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Produktionmængde er obligatorisk
 DocType: Loan,Repayment Method,tilbagebetaling Metode
@@ -4046,7 +4038,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Forfalder den
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Hvis markeret, skjuler og deaktiverer feltet Rounded Total i lønningssedler"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Dette er standardforskydningen (dage) for leveringsdatoen i salgsordrer. Fallback-forskydningen er 7 dage fra bestillingsdato.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Indstil nummerserier til deltagelse via Opsætning> Nummereringsserie
 DocType: Rename Tool,File to Rename,Fil der skal omdøbes
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Hent abonnementsopdateringer
@@ -4649,7 +4640,6 @@ DocType: Healthcare Service Unit Type,Item Details,Elementdetaljer
 DocType: Cash Flow Mapping,Is Finance Cost,Er finansiering omkostninger
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til udskrivning)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Indstil instruktørens navngivningssystem i uddannelse> Uddannelsesindstillinger
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Indstil standardkunde i Restaurantindstillinger
 ,Salary Register,Løn Register
 DocType: Company,Default warehouse for Sales Return,Standardlager til salgsafkast
@@ -4920,7 +4910,6 @@ DocType: Item,Inspection Required before Purchase,Kontrol påkrævet før køb
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Afventende aktiviteter
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Lav Lab Test
 DocType: Patient Appointment,Reminded,mindet
-DocType: Homepage Section,Cards,Kort
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Se oversigt over konti
 DocType: Chapter Member,Chapter Member,Kapitel Medlem
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimumsordrenummer
@@ -4938,7 +4927,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Fremtidige datoer ikke tilladt
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Forventet leveringsdato skal være efter salgsordredato
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Genbestil Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontoplan Skabelon
+DocType: Company,Chart Of Accounts Template,Kontoplan Skabelon
 DocType: Attendance,Attendance Date,Fremmøde dato
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Opdateringslager skal aktiveres for købsfakturaen {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
@@ -5503,8 +5492,6 @@ DocType: Installation Note,Installation Date,Installation Dato
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Del Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Salgsfaktura {0} oprettet
 DocType: Employee,Confirmation Date,Bekræftet den
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Slet medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 DocType: Inpatient Occupancy,Check Out,Check ud
 DocType: C-Form,Total Invoiced Amount,Totalt faktureret beløb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
@@ -5711,7 +5698,6 @@ DocType: Employee,Prefered Contact Email,Foretrukket kontakt e-mail
 DocType: Cheque Print Template,Cheque Width,Anvendes ikke
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Godkend salgspris for vare mod købspris eller værdiansættelsespris
 DocType: Fee Schedule,Fee Schedule,Fee Schedule
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolonnetiketter:
 DocType: Bank Transaction,Settled,Slog sig ned
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametre
@@ -6386,6 +6372,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serienummer
 DocType: Material Request Plan Item,Required Quantity,Påkrævet mængde
+DocType: Cash Flow Mapping Template,Template Name,Skabelonnavn
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Regnskabsperiode overlapper med {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Salgskonto
@@ -6446,7 +6433,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Som på dato
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Som på dato
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Tilmelding Dato
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS Alerts
@@ -6512,7 +6499,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Quiz
 DocType: Subscription,Trial Period End Date,Prøveperiode Slutdato
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Begynd med at indtaste data herfra:
 DocType: Serial No,Asset Status,Aktiver status
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over dimensionel last (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurantbord
@@ -6738,7 +6724,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Indse
 DocType: Contract,Party User,Selskabs-bruger
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,"Aktiver, der ikke er oprettet for <b>{0}</b> . Du skal oprette aktiv manuelt."
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Indstil Firmafilter blankt, hvis Group By er &#39;Company&#39;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Bogføringsdato kan ikke være en fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: serienummer {1} matcher ikke med {2} {3}
 DocType: Loan Repayment,Interest Payable,Rentebetaling
@@ -6973,7 +6958,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Gennemsnitlig sats
 DocType: Appointment,Appointment With,Aftale med
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samlet betalingsbeløb i betalingsplan skal svare til Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Markér deltagelse som <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Kundens leverede vare"" kan ikke have værdiansættelsesrate"
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Kontoudskrift balance pr Finans
@@ -7663,7 +7647,6 @@ DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimal ydelsesbeløb for medarbejderen {0} overstiger {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Samlede fordelte blade er mere end dage i perioden
 DocType: Linked Soil Analysis,Linked Soil Analysis,Linked Soil Analysis
-DocType: Pricing Rule,Percentage,Procent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Vare {0} skal være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard varer-i-arbejde-lager
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Skemaer for {0} overlapninger, vil du fortsætte efter at have oversat overlapte slots?"

erpnext/translations/de.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Terminbuchung Slots
 DocType: Work Order Operation,Work In Progress,Laufende Arbeit/-en
 DocType: Leave Control Panel,Branch (optional),Zweigstelle (optional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Bitte wählen Sie Datum
-DocType: Item Price,Minimum Qty ,Mindestmenge
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Mindestmenge
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Stücklistenrekursion: {0} darf nicht untergeordnet zu {1} sein
 DocType: Finance Book,Finance Book,Finanzbuch
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Urlaubsübersicht
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Das übergeordnete Konto {0} ist nicht vorhanden
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Überprüfung und Aktion
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Dieser Mitarbeiter hat bereits ein Protokoll mit demselben Zeitstempel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Buchhalter
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Pens
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Gewinn/Verlust
 DocType: Crop,Perennial,Staude
 DocType: Program,Is Published,Ist veröffentlicht
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Lieferscheine anzeigen
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Aktualisieren Sie "Over Billing Allowance" in den Kontoeinstellungen oder im Artikel, um eine Überberechnung zuzulassen."
 DocType: Patient Appointment,Procedure,Verfahren
 DocType: Accounts Settings,Use Custom Cash Flow Format,Benutzerdefiniertes Cashflow-Format verwenden
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Risikofaktoren
 DocType: Patient,Occupational Hazards and Environmental Factors,Berufsrisiken und Umweltfaktoren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Lagereinträge, die bereits für den Arbeitsauftrag erstellt wurden"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Artikelcode> Artikelgruppe> Marke
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Frühere Bestellungen anzeigen
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} Konversationen
 DocType: Vital Signs,Respiratory rate,Atemfrequenz
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Während des Aktualisierungsprozesses ist ein Fehler aufgetreten
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservierung
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Ihre Artikel
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Lieferant> Lieferantentyp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Verfassen von Angeboten
 DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlungsabzug
 DocType: Service Level Priority,Service Level Priority,Service Level Priorität
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Bitte wählen Sie Unternehmen und Buchungsdatum, um Einträge zu erhalten"
 DocType: Asset,Maintenance,Wartung
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Von der Patientenbegegnung erhalten
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -> {1}) für Element nicht gefunden: {2}
 DocType: Subscriber,Subscriber,Teilnehmer
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Der Währungsumtausch muss beim Kauf oder beim Verkauf anwendbar sein.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,Betrag mit Marge
 DocType: Purchase Invoice,Is Return (Debit Note),ist Rücklieferung (Lastschrift)
 DocType: Workstation,Wages,Lohn
 DocType: Asset Maintenance,Maintenance Manager Name,Name des Wartungs-Managers
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaktionen gegen das Unternehmen bestehen bereits!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Anfordernde Site
 DocType: Agriculture Task,Urgent,Dringend
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Einträge werden abgefragt ...
@@ -2652,7 +2646,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Die Zahlungsbedingung in Zeile {0} ist möglicherweise ein Duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Landwirtschaft (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Packzettel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Bitte stellen Sie die Namensreihe über Setup> Einstellungen> Namensreihe auf {0} ein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Büromiete
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
 DocType: Disease,Common Name,Gemeinsamen Namen
@@ -2818,7 +2811,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Keine Artikel zum Verpacken
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Derzeit werden nur CSV- und XLSX-Dateien unterstützt
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Bitte richten Sie das Employee Naming System unter Human Resource> HR Settings ein
 DocType: Shipping Rule Condition,From Value,Von-Wert
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
 DocType: Loan,Repayment Method,Rückzahlweg
@@ -4065,7 +4057,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Benötigt am
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Wenn diese Option aktiviert ist, wird das Feld "Gerundete Summe" in Gehaltsabrechnungen ausgeblendet und deaktiviert"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Dies ist der Standardversatz (Tage) für das Lieferdatum in Kundenaufträgen. Der Fallback-Offset beträgt 7 Tage ab Bestelldatum.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über Setup> Nummerierungsserie ein
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Bitte Stückliste für Artikel in Zeile {0} auswählen
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Abruf von Abonnement-Updates
@@ -4700,7 +4691,6 @@ DocType: Healthcare Service Unit Type,Item Details,Artikeldetails
 DocType: Cash Flow Mapping,Is Finance Cost,Ist Finanzen Kosten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,"""Anwesenheit von Mitarbeiter"" {0} ist bereits markiert"
 DocType: Packing Slip,If more than one package of the same type (for print),Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Bitte richten Sie das Instructor Naming System unter Education> Education Settings ein
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Bitte setzen Sie den Standardkunden in den Restauranteinstellungen
 ,Salary Register,Gehalt Register
 DocType: Company,Default warehouse for Sales Return,Standardlager für Verkaufsretoure
@@ -4971,7 +4961,6 @@ DocType: Item,Inspection Required before Purchase,"Inspektion erforderlich, bevo
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Ausstehende Aktivitäten
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Labortest erstellen
 DocType: Patient Appointment,Reminded,Erinnert
-DocType: Homepage Section,Cards,Karten
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Kontenplan anzeigen
 DocType: Chapter Member,Chapter Member,Gruppen-Mitglied
 DocType: Material Request Plan Item,Minimum Order Quantity,Mindestbestellmenge
@@ -4989,7 +4978,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Zukünftige Termine sind nicht erlaubt
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Voraussichtlicher Liefertermin sollte nach Kundenauftragsdatum erfolgen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Meldebestand
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontenvorlage
+DocType: Company,Chart Of Accounts Template,Kontenvorlage
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Die Aktualisierung des Bestands muss für die Eingangsrechnung {0} aktiviert sein.
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Artikel Preis aktualisiert für {0} in der Preisliste {1}
@@ -5554,8 +5543,6 @@ DocType: Installation Note,Installation Date,Datum der Installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Aktienbuch
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Verkaufsrechnung {0} erstellt
 DocType: Employee,Confirmation Date,Datum bestätigen
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument zu stornieren"
 DocType: Inpatient Occupancy,Check Out,Check-Out
 DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Mindestmenge kann nicht größer als Maximalmenge sein
@@ -5762,7 +5749,6 @@ DocType: Employee,Prefered Contact Email,Bevorzugte Kontakt E-Mail
 DocType: Cheque Print Template,Cheque Width,Scheck Breite
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Bestätigen Sie den  Verkaufspreis für den Posten gegen  den Einkaufspreis oder Bewertungskurs
 DocType: Fee Schedule,Fee Schedule,Gebührenordnung
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Spaltenbeschriftungen:
 DocType: Bank Transaction,Settled,Erledigt
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parameter
@@ -6436,6 +6422,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serien #
 DocType: Material Request Plan Item,Required Quantity,Benötigte Menge
+DocType: Cash Flow Mapping Template,Template Name,Vorlagenname
 DocType: Lab Test Template,Lab Test Template,Labortestvorlage
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Abrechnungszeitraum überschneidet sich mit {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Verkaufskonto
@@ -6496,7 +6483,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Kontogruppe {1} gehört nicht zu Unternehmen {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Alle Transaktionen dieses Unternehmens wurden erfolgreich gelöscht!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Zum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Zum
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Enrollment Datum
 DocType: Healthcare Settings,Out Patient SMS Alerts,SMS-Benachrichtungen für ambulante Patienten
@@ -6562,7 +6549,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Quiz
 DocType: Subscription,Trial Period End Date,Testzeitraum Enddatum
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Beginnen Sie hier mit der Dateneingabe:
 DocType: Serial No,Asset Status,Status Vermögenswert
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Überdimensionale Ladung (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurant-Tisch
@@ -6788,7 +6774,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Bewer
 DocType: Contract,Party User,Party Benutzer
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Für <b>{0} wurden</b> keine Assets erstellt. Sie müssen das Asset manuell erstellen.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Bitte den Filter ""Unternehmen"" leeren, wenn nach Unternehmen gruppiert wird"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Buchungsdatum kann nicht Datum in der Zukunft sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
 DocType: Loan Repayment,Interest Payable,Zu zahlende Zinsen
@@ -7021,7 +7006,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Durchschnittsrate
 DocType: Appointment,Appointment With,Termin mit
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Der gesamte Zahlungsbetrag im Zahlungsplan muss gleich Groß / Abgerundet sein
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Anwesenheit als markieren <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Customer Provided Item"" kann eine Bewertung haben."
 DocType: Subscription Plan Detail,Plan,Planen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
@@ -7713,7 +7697,6 @@ DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldet
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Der maximale Leistungsbetrag von Mitarbeiter {0} übersteigt {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Die Gesamtmenge des beantragten Urlaubs übersteigt die Tage in der Periode
 DocType: Linked Soil Analysis,Linked Soil Analysis,Verbundene Bodenanalyse
-DocType: Pricing Rule,Percentage,Prozentsatz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Schedules für {0} Überlappungen, möchten Sie nach Überlappung überlappender Slots fortfahren?"

erpnext/translations/el.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Ραντεβού γ
 DocType: Work Order Operation,Work In Progress,Εργασία σε εξέλιξη
 DocType: Leave Control Panel,Branch (optional),Υποκατάστημα (προαιρετικό)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Παρακαλώ επιλέξτε ημερομηνία
-DocType: Item Price,Minimum Qty ,Ελάχιστη ποσότητα
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Ελάχιστη ποσότητα
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Αναδρομή στο BOM: {0} δεν μπορεί να είναι παιδί {1}
 DocType: Finance Book,Finance Book,Οικονομικό βιβλίο
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Λίστα αργιών
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Ο γονικός λογαριασμός {0} δεν υπάρχει
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Ανασκόπηση και δράση
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Αυτός ο υπάλληλος έχει ήδη ένα αρχείο καταγραφής με την ίδια χρονική σήμανση. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Λογιστής
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Ιδ
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Κέρδος / Απώλεια
 DocType: Crop,Perennial,Αιωνόβιος
 DocType: Program,Is Published,Δημοσιεύεται
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Εμφάνιση σημείων παραλαβής
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Για να επιτρέψετε την υπερβολική τιμολόγηση, ενημερώστε την "Over Allowance Billing" στις Ρυθμίσεις Λογαριασμών ή στο Στοιχείο."
 DocType: Patient Appointment,Procedure,Διαδικασία
 DocType: Accounts Settings,Use Custom Cash Flow Format,Χρησιμοποιήστε την προσαρμοσμένη μορφή ροής μετρητών
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Παράγοντες κινδύνου
 DocType: Patient,Occupational Hazards and Environmental Factors,Επαγγελματικοί κίνδυνοι και περιβαλλοντικοί παράγοντες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Καταχωρήσεις αποθέματος που έχουν ήδη δημιουργηθεί για παραγγελία εργασίας
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Κωδικός στοιχείου> Ομάδα στοιχείων> Μάρκα
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Δείτε τις προηγούμενες παραγγελίες
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} συνομιλίες
 DocType: Vital Signs,Respiratory rate,Ρυθμός αναπνοής
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Παρουσιάστηκε σφάλμα κατά τη διαδικασία ενημέρωσης
 DocType: Restaurant Reservation,Restaurant Reservation,Εστιατόριο Κράτηση
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Τα στοιχεία σας
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Προμηθευτής> Τύπος προμηθευτή
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Συγγραφή πρότασης
 DocType: Payment Entry Deduction,Payment Entry Deduction,Έκπτωση Έναρξη Πληρωμής
 DocType: Service Level Priority,Service Level Priority,Προτεραιότητα επιπέδου υπηρεσιών
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Επιλέξτε Εταιρεία και ημερομηνία δημοσίευσης για να λάβετε καταχωρήσεις
 DocType: Asset,Maintenance,Συντήρηση
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Λάβετε από την συνάντηση των ασθενών
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -> {1}) δεν βρέθηκε για το στοιχείο: {2}
 DocType: Subscriber,Subscriber,Συνδρομητής
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Η υπηρεσία συναλλάγματος πρέπει να ισχύει για την αγορά ή την πώληση.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,Τιμή με περιθώριο
 DocType: Purchase Invoice,Is Return (Debit Note),Επιστροφή (χρεωστική σημείωση)
 DocType: Workstation,Wages,œΜισθοί
 DocType: Asset Maintenance,Maintenance Manager Name,Όνομα διαχειριστή συντήρησης
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Συναλλαγές με την εταιρεία υπάρχουν ήδη!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Αιτούσα τοποθεσία
 DocType: Agriculture Task,Urgent,Επείγον
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Ανάκτηση αρχείων ......
@@ -2651,7 +2645,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Ο όρος πληρωμής στη σειρά {0} είναι πιθανώς διπλό.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Γεωργία (βήτα)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Δελτίο συσκευασίας
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup> Settings> Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
 DocType: Disease,Common Name,Συνηθισμένο όνομα
@@ -2817,7 +2810,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Μόνο αρχεία .csv και .xlsx υποστηρίζονται αυτήν τη στιγμή
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό> Ρυθμίσεις HR
 DocType: Shipping Rule Condition,From Value,Από τιμή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
 DocType: Loan,Repayment Method,Τρόπος αποπληρωμής
@@ -4064,7 +4056,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Απαιτείται στις
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Εάν είναι επιλεγμένο, αποκρύπτει και απενεργοποιεί το πεδίο Στρογγυλεμένο Σύνολο στις Μορφές Μισθών"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Αυτή είναι η προεπιλεγμένη αντιστάθμιση (ημέρες) για την Ημερομηνία παράδοσης στις Παραγγελίες Πωλήσεων. Η αντισταθμιστική αντιστάθμιση είναι 7 ημέρες από την ημερομηνία τοποθέτησης της παραγγελίας.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης> Σειρά αρίθμησης
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Λήψη ενημερώσεων συνδρομής
@@ -4699,7 +4690,6 @@ DocType: Healthcare Service Unit Type,Item Details,Λεπτομέρειες εί
 DocType: Cash Flow Mapping,Is Finance Cost,Είναι το κόστος χρηματοδότησης
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
 DocType: Packing Slip,If more than one package of the same type (for print),Εάν περισσότερες από μία συσκευασίες του ίδιου τύπου (για εκτύπωση)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση> Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Ορίστε τον προεπιλεγμένο πελάτη στις Ρυθμίσεις εστιατορίου
 ,Salary Register,μισθός Εγγραφή
 DocType: Company,Default warehouse for Sales Return,Προκαθορισμένη αποθήκη για επιστροφή πωλήσεων
@@ -4970,7 +4960,6 @@ DocType: Item,Inspection Required before Purchase,Επιθεώρησης Απα
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Εν αναμονή Δραστηριότητες
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Δημιουργία δοκιμής εργαστηρίου
 DocType: Patient Appointment,Reminded,Υπενθύμισε
-DocType: Homepage Section,Cards,Καρτέλλες
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Δείτε το πρόγραμμα λογαριασμών
 DocType: Chapter Member,Chapter Member,Μέλος του κεφαλαίου
 DocType: Material Request Plan Item,Minimum Order Quantity,Ελάχιστη ποσότητα παραγγελίας
@@ -4988,7 +4977,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Οι μελλοντικές ημερομηνίες δεν επιτρέπονται
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης πρέπει να είναι μετά την ημερομηνία παραγγελίας
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Αναδιάταξη επιπέδου
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Διάγραμμα του προτύπου Λογαριασμών
+DocType: Company,Chart Of Accounts Template,Διάγραμμα του προτύπου Λογαριασμών
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Πρέπει να ενεργοποιηθεί το ενημερωτικό απόθεμα για το τιμολόγιο αγοράς {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Είδους Τιμή ενημερωθεί για {0} στον κατάλογο τιμή {1}
@@ -5553,8 +5542,6 @@ DocType: Installation Note,Installation Date,Ημερομηνία εγκατάσ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Λογαριασμός μετοχών
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Το τιμολόγιο πωλήσεων {0} δημιουργήθηκε
 DocType: Employee,Confirmation Date,Ημερομηνία επιβεβαίωσης
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 DocType: Inpatient Occupancy,Check Out,Ολοκλήρωση αγοράς
 DocType: C-Form,Total Invoiced Amount,Συνολικό ποσό που τιμολογήθηκε
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Η ελάχιστη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την μέγιστη ποσότητα
@@ -5761,7 +5748,6 @@ DocType: Employee,Prefered Contact Email,Προτιμώμενη Επικοινω
 DocType: Cheque Print Template,Cheque Width,Επιταγή Πλάτος
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Επικυρώνει τιμή πώλησης για τη θέση ενάντια Purchase Rate ή αποτίμησης Rate
 DocType: Fee Schedule,Fee Schedule,Πρόγραμμα Fee
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Ετικέτες στήλης:
 DocType: Bank Transaction,Settled,Τακτοποιημένο
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Παράμετροι
@@ -6435,6 +6421,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,Τύπος
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Σειριακός αριθμός #
 DocType: Material Request Plan Item,Required Quantity,Απαιτούμενη ποσότητα
+DocType: Cash Flow Mapping Template,Template Name,Όνομα προτύπου
 DocType: Lab Test Template,Lab Test Template,Πρότυπο δοκιμής εργαστηρίου
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Η περίοδος λογιστικής επικαλύπτεται με {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Λογαριασμός πωλήσεων
@@ -6495,7 +6482,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Ως ημερομηνία για
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Ως ημερομηνία για
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,εγγραφή Ημερομηνία
 DocType: Healthcare Settings,Out Patient SMS Alerts,Ειδοποιήσεις SMS ασθενούς
@@ -6561,7 +6548,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Κουίζ
 DocType: Subscription,Trial Period End Date,Ημερομηνία λήξης της δοκιμαστικής περιόδου
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Δεν επιτρέπεται δεδομένου ότι το {0} υπερβαίνει τα όρια
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Αρχίστε να εισάγετε δεδομένα από εδώ:
 DocType: Serial No,Asset Status,Κατάσταση περιουσιακών στοιχείων
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Υπερφορικό φορτίο (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Πίνακας εστιατορίων
@@ -6788,7 +6774,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Υπ
 DocType: Contract,Party User,Χρήστης κόμματος
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Τα στοιχεία που δεν δημιουργήθηκαν για <b>{0}</b> . Θα πρέπει να δημιουργήσετε το στοιχείο μη αυτόματα.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Ρυθμίστε το φίλτρο Εταιρεία κενό, εάν η ομάδα είναι &quot;Εταιρεία&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Απόσπαση ημερομηνία αυτή δεν μπορεί να είναι μελλοντική ημερομηνία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
 DocType: Loan Repayment,Interest Payable,Πληρωτέος τόκος
@@ -7023,7 +7008,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Μέσος όρος
 DocType: Appointment,Appointment With,Ραντεβού με
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Το συνολικό ποσό πληρωμής στο Πρόγραμμα Πληρωμών πρέπει να είναι ίσο με το Μεγάλο / Στρογγυλεμένο Σύνολο
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Σημειώστε τη συμμετοχή ως <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Το ""Στοιχείο που παρέχεται από πελάτη"" δεν μπορεί να έχει Τιμή εκτίμησης"
 DocType: Subscription Plan Detail,Plan,Σχέδιο
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Δήλωση ισορροπία τραπεζών σύμφωνα με τη Γενική Λογιστική
@@ -7714,7 +7698,6 @@ DocType: Item Customer Detail,Item Customer Detail,Λεπτομέρειες πε
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Το μέγιστο ποσό παροχών του υπαλλήλου {0} υπερβαίνει το {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ημέρες κατά την περίοδο
 DocType: Linked Soil Analysis,Linked Soil Analysis,Συνδεδεμένη ανάλυση εδάφους
-DocType: Pricing Rule,Percentage,Τοις εκατό
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Το είδος {0} πρέπει να είναι ένα αποθηκεύσιμο είδος
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Προεπιλογή Work In Progress Αποθήκη
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Χρονοδιαγράμματα για επικαλύψεις {0}, θέλετε να προχωρήσετε αφού παρακάμπτεστε τις επικαλυμμένες υποδοχές;"

erpnext/translations/es.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Ranuras de reserva
 DocType: Work Order Operation,Work In Progress,Trabajo en proceso
 DocType: Leave Control Panel,Branch (optional),Rama (opcional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Por favor seleccione la fecha
-DocType: Item Price,Minimum Qty ,Cantidad Mínima
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Cantidad Mínima
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Recurrencia de la lista de materiales: {0} no puede ser hijo de {1}
 DocType: Finance Book,Finance Book,Libro de Finanzas
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Lista de festividades
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,La cuenta principal {0} no existe
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisión y acción
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Este empleado ya tiene un registro con la misma marca de tiempo. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contador
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Fond
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Pérdida/Ganancia
 DocType: Crop,Perennial,Perenne
 DocType: Program,Is Published,Esta publicado
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Mostrar notas de entrega
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Para permitir la facturación excesiva, actualice "Asignación de facturación excesiva" en la Configuración de cuentas o el Artículo."
 DocType: Patient Appointment,Procedure,Procedimiento
 DocType: Accounts Settings,Use Custom Cash Flow Format,Utilice el Formato de Flujo de Efectivo Personalizado
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Factores de Riesgo
 DocType: Patient,Occupational Hazards and Environmental Factors,Riesgos Laborales y Factores Ambientales
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entradas de Stock ya creadas para Órden de Trabajo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Código de artículo> Grupo de artículos> Marca
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Ver pedidos anteriores
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} conversaciones
 DocType: Vital Signs,Respiratory rate,Frecuencia Respiratoria
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Se produjo un error durante el proceso de actualización
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de Restaurante
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Tus cosas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Proveedor> Tipo de proveedor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Redacción de propuestas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Deducción de Entrada de Pago
 DocType: Service Level Priority,Service Level Priority,Prioridad de nivel de servicio
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Seleccione Empresa y Fecha de publicación para obtener entradas
 DocType: Asset,Maintenance,Mantenimiento
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Obtenga del Encuentro de Pacientes
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Factor de conversión de UOM ({0} -> {1}) no encontrado para el elemento: {2}
 DocType: Subscriber,Subscriber,Abonado
 DocType: Item Attribute Value,Item Attribute Value,Atributos del Producto
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,El Cambio de Moneda debe ser aplicable para comprar o vender.
@@ -1936,7 +1931,6 @@ DocType: Sales Invoice Item,Rate With Margin,Tarifa con margen
 DocType: Purchase Invoice,Is Return (Debit Note),Es Retorno (Nota de Débito)
 DocType: Workstation,Wages,Salarios
 DocType: Asset Maintenance,Maintenance Manager Name,Nombre del Administrador de Mantenimiento
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,¡Ya existen transacciones contra la empresa!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Sitio solicitante
 DocType: Agriculture Task,Urgent,Urgente
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Obteniendo Registros......
@@ -2633,7 +2627,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,El Término de Pago en la fila {0} es posiblemente un duplicado.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Agricultura (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Lista de embalaje
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Configure Naming Series para {0} a través de Configuración> Configuración> Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Alquiler de Oficina
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Configuración de pasarela SMS
 DocType: Disease,Common Name,Nombre Común
@@ -2799,7 +2792,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,No hay productos para empacar
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Actualmente solo se admiten archivos .csv y .xlsx
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos> Configuración de recursos humanos
 DocType: Shipping Rule Condition,From Value,Desde Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
 DocType: Loan,Repayment Method,Método de Reembolso
@@ -4046,7 +4038,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Solicitado el
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Si está marcado, oculta y deshabilita el campo Total redondeado en los recibos de salario"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Este es el desplazamiento predeterminado (días) para la Fecha de entrega en Pedidos de ventas. La compensación alternativa es de 7 días a partir de la fecha de colocación del pedido.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Configure la serie de numeración para la Asistencia a través de Configuración> Serie de numeración
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Obtener Actualizaciones de Suscripción
@@ -4661,7 +4652,6 @@ DocType: Healthcare Service Unit Type,Item Details,Detalles del artículo
 DocType: Cash Flow Mapping,Is Finance Cost,Es el Costo de las Finanzas
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,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)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Configure el Sistema de nombres de instructores en Educación> Configuración de educación
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,"Por favor, configure el cliente predeterminado en la configuración del Restaurante"
 ,Salary Register,Registro de Salario
 DocType: Company,Default warehouse for Sales Return,Almacén predeterminado para devolución de ventas
@@ -4932,7 +4922,6 @@ DocType: Item,Inspection Required before Purchase,Inspección requerida antes de
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Actividades Pendientes
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Crear Prueba de Laboratorio
 DocType: Patient Appointment,Reminded,Recordado
-DocType: Homepage Section,Cards,Tarjetas
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Ver el Cuadro de Cuentas
 DocType: Chapter Member,Chapter Member,Miembro del Capítulo
 DocType: Material Request Plan Item,Minimum Order Quantity,Cantidad Mínima de Pedido
@@ -4950,7 +4939,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,No se permiten fechas futuras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La fecha de entrega esperada debe ser posterior a la fecha del pedido de cliente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Nivel de reabastecimiento
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Plantilla del catálogo de cuentas
+DocType: Company,Chart Of Accounts Template,Plantilla del catálogo de cuentas
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Actualizar Stock debe estar habilitado para la Factura de Compra {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Precio del producto actualizado para {0} en Lista de Precios {1}
@@ -5515,8 +5504,6 @@ DocType: Installation Note,Installation Date,Fecha de Instalación
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Factura de Venta {0} creada
 DocType: Employee,Confirmation Date,Fecha de confirmación
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Inpatient Occupancy,Check Out,Check Out
 DocType: C-Form,Total Invoiced Amount,Total Facturado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
@@ -5723,7 +5710,6 @@ DocType: Employee,Prefered Contact Email,Correo electrónico de contacto preferi
 DocType: Cheque Print Template,Cheque Width,Ancho Cheque
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar precio de venta para el artículo contra la Tarifa de compra o tasa de valorización
 DocType: Fee Schedule,Fee Schedule,Programa de Cuotas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Etiquetas de columna:
 DocType: Bank Transaction,Settled,Colocado
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Impuesto
 DocType: Quality Feedback,Parameters,Parámetros
@@ -6397,6 +6383,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,V
 DocType: Salary Component,Formula,Fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #.
 DocType: Material Request Plan Item,Required Quantity,Cantidad requerida
+DocType: Cash Flow Mapping Template,Template Name,Nombre de Plantilla
 DocType: Lab Test Template,Lab Test Template,Plantilla de Prueba de Laboratorio
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},El período contable se superpone con {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Cuenta de Ventas
@@ -6457,7 +6444,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,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,As on Date,A la fecha
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,A la fecha
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Fecha de inscripción
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alertas SMS de Pacientes
@@ -6523,7 +6510,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Examen
 DocType: Subscription,Trial Period End Date,Fecha de Finalización del Período de Prueba
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Comience a ingresar datos desde aquí:
 DocType: Serial No,Asset Status,Estado del Activo
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Carga Sobredimensionada (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Mesa de Restaurante
@@ -6749,7 +6735,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Envia
 DocType: Contract,Party User,Usuario Tercero
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Activos no creados para <b>{0}</b> . Deberá crear un activo manualmente.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Por favor, ponga el filtro de la Compañía en blanco si el Grupo Por es ' Empresa'."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Fecha de entrada no puede ser fecha futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Fila #{0}: Número de serie {1} no coincide con {2} {3}
 DocType: Loan Repayment,Interest Payable,Los intereses a pagar
@@ -6984,7 +6969,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Tasa Promedio
 DocType: Appointment,Appointment With,Cita con
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,El monto total del pago en el cronograma de pago debe ser igual al total / Total Redondeado
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcar asistencia como <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","El ""artículo proporcionado por el cliente"" no puede tener una tasa de valoración"
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Saldo de Extracto Bancario según Balance General
@@ -7676,7 +7660,6 @@ DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},La cantidad máxima de beneficios del empleado {0} excede de {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Total de hojas asignados son más que los días en el período
 DocType: Linked Soil Analysis,Linked Soil Analysis,Análisis de Suelo Vinculado
-DocType: Pricing Rule,Percentage,Porcentaje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Las planificaciones para superposiciones de {0}, ¿Desea continuar después de omitir las ranuras superpuestas?"

erpnext/translations/et.csv

@@ -166,12 +166,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Kohtumiste broneeri
 DocType: Work Order Operation,Work In Progress,Töö käib
 DocType: Leave Control Panel,Branch (optional),Filiaal (valikuline)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Palun valige kuupäev
-DocType: Item Price,Minimum Qty ,Minimaalne kogus
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimaalne kogus
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM-i rekursioon: {0} ei saa olla lapse {1} laps
 DocType: Finance Book,Finance Book,Rahandusraamat
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC- .YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Holiday nimekiri
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Emakontot {0} ei eksisteeri
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Ülevaade ja tegevus
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Sellel töötajal on juba sama ajatempliga logi. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Raamatupidaja
@@ -243,7 +242,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Pens
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Kasum / kahjum
 DocType: Crop,Perennial,Mitmeaastane
 DocType: Program,Is Published,Avaldatakse
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Kuva saatelehed
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",Ülearvelduse lubamiseks värskendage konto seadetes või üksuses jaotist "Üle arvelduse hüvitis".
 DocType: Patient Appointment,Procedure,Menetlus
 DocType: Accounts Settings,Use Custom Cash Flow Format,Kasutage kohandatud rahavoogude vormingut
@@ -976,7 +974,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Riskifaktorid
 DocType: Patient,Occupational Hazards and Environmental Factors,Kutsealased ohud ja keskkonnategurid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Tööpakkumiste jaoks juba loodud laoseisud
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kauba kood> esemerühm> kaubamärk
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Varasemate tellimuste vaatamine
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} vestlust
 DocType: Vital Signs,Respiratory rate,Hingamissagedus
@@ -1133,7 +1130,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Värskendamise käigus tekkis viga
 DocType: Restaurant Reservation,Restaurant Reservation,Restorani broneering
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Teie esemed
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Tarnija> Tarnija tüüp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Ettepanek kirjutamine
 DocType: Payment Entry Deduction,Payment Entry Deduction,Makse Entry mahaarvamine
 DocType: Service Level Priority,Service Level Priority,Teenuse taseme prioriteet
@@ -1431,7 +1427,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Kirjete saamiseks valige ettevõtte ja postitamise kuupäev
 DocType: Asset,Maintenance,Hooldus
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Hankige patsiendikogusest
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM teisendustegurit ({0} -> {1}) üksusele {2} ei leitud
 DocType: Subscriber,Subscriber,Abonent
 DocType: Item Attribute Value,Item Attribute Value,Punkt omadus Value
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valuutavahetus tuleb kohaldada ostmise või müügi suhtes.
@@ -1929,7 +1924,6 @@ DocType: Sales Invoice Item,Rate With Margin,Määra Margin
 DocType: Purchase Invoice,Is Return (Debit Note),Kas tagasitulek (debiteerimata märkus)
 DocType: Workstation,Wages,Palgad
 DocType: Asset Maintenance,Maintenance Manager Name,Hooldusjuhi nimi
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Ettevõtte vastu on tehingud juba olemas!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Taotlev sait
 DocType: Agriculture Task,Urgent,Urgent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Kirjete toomine ......
@@ -2625,7 +2619,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Makse tähtaeg reas {0} on tõenäoliselt duplikaat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Põllumajandus (beetaversioon)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakkesedel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Valige Seadistamise seeria väärtuseks {0}, mis asub seadistuse> Seadistused> Seeria nimetamine"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Office rent
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Setup SMS gateway seaded
 DocType: Disease,Common Name,Üldnimetus
@@ -2791,7 +2784,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lehed Eraldatud edukalt {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,"Ole tooteid, mida pakkida"
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Praegu toetatakse ainult .csv- ja .xlsx-faile
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist> HR-sätted
 DocType: Shipping Rule Condition,From Value,Väärtuse
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
 DocType: Loan,Repayment Method,tagasimaksmine meetod
@@ -4036,7 +4028,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Nõutav
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Kui see on märgitud, peidab ja keelab palgaklaaside välja ümardatud kogusumma"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,See on müügikorralduses tarnekuupäeva vaikimisi nihkumine (päevades). Varu korvamine toimub 7 päeva jooksul alates tellimuse esitamise kuupäevast.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise> Numeratsiooniseeria kaudu
 DocType: Rename Tool,File to Rename,Fail Nimeta ümber
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Liitumiste värskenduste hankimine
@@ -4636,7 +4627,6 @@ DocType: Healthcare Service Unit Type,Item Details,Üksuse detailid
 DocType: Cash Flow Mapping,Is Finance Cost,Kas rahakulu
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Osalemine töötajate {0} on juba märgitud
 DocType: Packing Slip,If more than one package of the same type (for print),Kui rohkem kui üks pakett on sama tüüpi (trüki)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus> Hariduse sätted
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Tehke vaikeseaded restoranis seaded
 ,Salary Register,palk Registreeri
 DocType: Company,Default warehouse for Sales Return,Vaikeladu müügi tagastamiseks
@@ -4907,7 +4897,6 @@ DocType: Item,Inspection Required before Purchase,Ülevaatus Vajalik enne ostu
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Kuni Tegevused
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Loo Lab Test
 DocType: Patient Appointment,Reminded,Meenutas
-DocType: Homepage Section,Cards,Kaardid
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Vaadake arveldusarvestust
 DocType: Chapter Member,Chapter Member,Peatükk Liige
 DocType: Material Request Plan Item,Minimum Order Quantity,Tellimuse miinimumkogus
@@ -4925,7 +4914,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Tulevased kuupäevad pole lubatud
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Oodatud tarnetähtaeg peaks olema pärast Müügikorralduse kuupäeva
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Reorder Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontoplaani Mall
+DocType: Company,Chart Of Accounts Template,Kontoplaani Mall
 DocType: Attendance,Attendance Date,Osavõtt kuupäev
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Ostuarve {0} jaoks peab olema lubatud väärtuse värskendamine
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Toode Hind uuendatud {0} Hinnakirjas {1}
@@ -5487,8 +5476,6 @@ DocType: Installation Note,Installation Date,Paigaldamise kuupäev
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Jaga Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Müügiarve {0} loodud
 DocType: Employee,Confirmation Date,Kinnitus kuupäev
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Selle dokumendi tühistamiseks kustutage töötaja <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Inpatient Occupancy,Check Out,Check Out
 DocType: C-Form,Total Invoiced Amount,Kokku Arve kogusumma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Kogus ei saa olla suurem kui Max Kogus
@@ -5695,7 +5682,6 @@ DocType: Employee,Prefered Contact Email,Eelistatud Kontakt E-post
 DocType: Cheque Print Template,Cheque Width,Tšekk Laius
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Kinnitada müügihind kulukoht ostmise korral või Hindamine Rate
 DocType: Fee Schedule,Fee Schedule,Fee Ajakava
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Veergude sildid:
 DocType: Bank Transaction,Settled,Asustatud
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parameetrid
@@ -6366,6 +6352,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,S
 DocType: Salary Component,Formula,valem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Vajalik kogus
+DocType: Cash Flow Mapping Template,Template Name,malli nimi
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Arvestusperiood kattub {0} -ga
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Müügikonto
@@ -6426,7 +6413,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ei kuulu firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kuupäeva järgi
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kuupäeva järgi
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Registreerimine kuupäev
 DocType: Healthcare Settings,Out Patient SMS Alerts,Patsiendi SMS-teated välja
@@ -6492,7 +6479,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Viktoriin
 DocType: Subscription,Trial Period End Date,Katseperioodi lõppkuupäev
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ei authroized kuna {0} ületab piirid
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Alustage andmete sisestamist siit:
 DocType: Serial No,Asset Status,Vara olek
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Ülemõõduline lasti (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restoran Tabel
@@ -6718,7 +6704,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Esita
 DocType: Contract,Party User,Partei kasutaja
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Varasid pole <b>{0}</b> jaoks loodud. Peate vara looma käsitsi.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Määrake Company filtreerida tühjaks, kui rühm Autor on &quot;Firma&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendirühm&gt; territoorium
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Postitamise kuupäev ei saa olla tulevikus
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} ei ühti {2} {3}
 DocType: Loan Repayment,Interest Payable,Makstav intress
@@ -6953,7 +6938,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Keskmine määr
 DocType: Appointment,Appointment With,Ametisse nimetamine
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksete kogusumma maksegraafikus peab olema võrdne Suur / Ümardatud Kokku
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Märgi kohalolijaks kui <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",Hindamismäära ei saa olla valikul „Kliendi pakutav üksus”
 DocType: Subscription Plan Detail,Plan,Plaan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bank avaldus tasakaalu kohta pearaamat
@@ -7643,7 +7627,6 @@ DocType: Item Customer Detail,Item Customer Detail,Punkt Kliendi Detail
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Töötaja maksimaalne hüvitise summa {0} ületab {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Kokku eraldatakse lehed on rohkem kui päeva võrra
 DocType: Linked Soil Analysis,Linked Soil Analysis,Seotud mullanalüüs
-DocType: Pricing Rule,Percentage,protsent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Punkt {0} peab olema laoartikkel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Vaikimisi Work In Progress Warehouse
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",Kas soovite {0} kattuvate ajakavade jätkata pärast ülekattega teenindusaegade vahelejätmist?

erpnext/translations/fa.csv

@@ -167,11 +167,10 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,اسلات های
 DocType: Work Order Operation,Work In Progress,کار در حال انجام
 DocType: Leave Control Panel,Branch (optional),شعبه (اختیاری)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,لطفا تاریخ را انتخاب کنید
-DocType: Item Price,Minimum Qty ,حداقل تعداد
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,حداقل تعداد
 DocType: Finance Book,Finance Book,کتاب مالی
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC- .YYYY.-
 DocType: Appointment Booking Settings,Holiday List,فهرست تعطیلات
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,حساب والدین {0} وجود ندارد
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,بررسی و اقدام
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},این کارمند قبلاً با همان دفترچه زمانی وارد سیستم شده است. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,حسابدار
@@ -243,7 +242,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,صن
 DocType: Exchange Rate Revaluation Account,Gain/Loss,به دست آوردن / از دست دادن
 DocType: Crop,Perennial,چند ساله
 DocType: Program,Is Published,منتشر شده است
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,نمایش یادداشت های تحویل
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",برای اجازه بیش از صدور صورت حساب ، "بیش از کمک هزینه صورتحساب" را در تنظیمات حساب یا مورد به روز کنید.
 DocType: Patient Appointment,Procedure,روش
 DocType: Accounts Settings,Use Custom Cash Flow Format,از فرم سفارشی جریان جریان استفاده کنید
@@ -963,7 +961,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,عوامل خطر
 DocType: Patient,Occupational Hazards and Environmental Factors,خطرات کاری و عوامل محیطی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,مقالات موجود برای سفارش کار ایجاد شده است
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,کد کالا> گروه مورد> نام تجاری
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,سفارشات گذشته را مشاهده کنید
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} مکالمه
 DocType: Vital Signs,Respiratory rate,نرخ تنفس
@@ -1117,7 +1114,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,یک خطا در طول فرایند به روز رسانی رخ داد
 DocType: Restaurant Reservation,Restaurant Reservation,رزرو رستوران
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,موارد شما
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,عرضه کننده> نوع عرضه کننده
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,نوشتن طرح های پیشنهادی
 DocType: Payment Entry Deduction,Payment Entry Deduction,پرداخت کسر ورود
 DocType: Service Level Priority,Service Level Priority,اولویت سطح خدمات
@@ -1905,7 +1901,6 @@ DocType: Sales Invoice Item,Rate With Margin,نرخ با حاشیه
 DocType: Purchase Invoice,Is Return (Debit Note),آیا بازگشت (توجه توجه)
 DocType: Workstation,Wages,مزد
 DocType: Asset Maintenance,Maintenance Manager Name,نام مدیر تعمیر و نگهداری
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,معاملات علیه شرکت در حال حاضر وجود دارد!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,درخواست سایت
 DocType: Agriculture Task,Urgent,فوری
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,ثبت پرونده ها ......
@@ -2747,7 +2742,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,هیچ آیتمی برای بسته
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,فقط فایلهای .csv و .xlsx در حال حاضر پشتیبانی می شوند
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی> تنظیمات HR تنظیم کنید
 DocType: Shipping Rule Condition,From Value,از ارزش
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
 DocType: Loan,Repayment Method,روش بازپرداخت
@@ -3964,7 +3958,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,مورد نیاز در
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips",اگر علامت زده شود ، قسمت Rounded Total را در Slip Slips مخفی کرده و غیرفعال می کند
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,این افست پیش فرض (روزها) برای تاریخ تحویل در سفارشات فروش است. افست برگشتی 7 روز از تاریخ تعیین سفارش می باشد.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم> سری شماره گذاری تنظیم کنید
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,دریافت به روز رسانی اشتراک
@@ -4550,7 +4543,6 @@ DocType: Healthcare Service Unit Type,Item Details,جزئیات مورد
 DocType: Cash Flow Mapping,Is Finance Cost,هزینه مالی است
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش> تنظیمات آموزش تنظیم کنید
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,لطفا تنظیمات پیشفرض را در تنظیمات رستوران تنظیم کنید
 ,Salary Register,حقوق و دستمزد ثبت نام
 DocType: Company,Default warehouse for Sales Return,انبار پیش فرض برای بازده فروش
@@ -4813,7 +4805,6 @@ DocType: Item,Inspection Required before Purchase,بازرسی مورد نیاز
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,فعالیت در انتظار
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,ایجاد تست آزمایشگاهی
 DocType: Patient Appointment,Reminded,یادآوری شد
-DocType: Homepage Section,Cards,کارت
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,نمایش نمودار حسابها
 DocType: Chapter Member,Chapter Member,اعضای گروه
 DocType: Material Request Plan Item,Minimum Order Quantity,حداقل مقدار سفارش
@@ -4829,7 +4820,7 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Newspaper Publishe
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,تاریخ های آینده مجاز نیست
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,تاریخ تحویل پیش بینی شده باید پس از تاریخ سفارش فروش باشد
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,ترتیب مجدد سطح
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,نمودار حساب الگو
+DocType: Company,Chart Of Accounts Template,نمودار حساب الگو
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},به روز رسانی سهام باید برای صورتحساب خرید فعال شود {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},مورد قیمت به روز شده برای {0} در لیست قیمت {1}
@@ -5385,8 +5376,6 @@ DocType: Installation Note,Installation Date,نصب و راه اندازی تا
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,به اشتراک گذاشتن لجر
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,فاکتور فروش {0} ایجاد شد
 DocType: Employee,Confirmation Date,تایید عضویت
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","لطفاً برای لغو این سند ، <a href=""#Form/Employee/{0}"">{0}</a> \ کارمند را حذف کنید"
 DocType: Inpatient Occupancy,Check Out,وارسی
 DocType: C-Form,Total Invoiced Amount,کل مقدار صورتحساب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,حداقل تعداد نمی تواند بیشتر از حداکثر تعداد
@@ -5585,7 +5574,6 @@ DocType: Employee,Prefered Contact Email,ترجیح ایمیل تماس
 DocType: Cheque Print Template,Cheque Width,عرض چک
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,اعتبار قیمت فروش برای مورد در برابر نرخ خرید و یا رای دادن به ارزش گذاری
 DocType: Fee Schedule,Fee Schedule,هزینه های برنامه
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,برچسب های ستون:
 DocType: Bank Transaction,Settled,حل و فصل
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,سس
 DocType: Quality Feedback,Parameters,مولفه های
@@ -6249,6 +6237,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,فرمول
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,سریال #
 DocType: Material Request Plan Item,Required Quantity,مقدار مورد نیاز
+DocType: Cash Flow Mapping Template,Template Name,نام الگو
 DocType: Lab Test Template,Lab Test Template,آزمایش آزمایشی
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},دوره حسابداری با {0} همپوشانی دارد
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,حساب فروش
@@ -6308,7 +6297,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,همانطور که در تاریخ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,همانطور که در تاریخ
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,تاریخ ثبت نام
 DocType: Healthcare Settings,Out Patient SMS Alerts,هشدارهای SMS بیمار
@@ -6373,7 +6362,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,مسابقه
 DocType: Subscription,Trial Period End Date,تاریخ پایان دوره آزمایشی
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,authroized نه از {0} بیش از محدودیت
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,وارد کردن داده ها از اینجا شروع کنید:
 DocType: Serial No,Asset Status,وضعیت دارایی
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),بیش از اندازه بار (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,جدول رستوران
@@ -6592,7 +6580,6 @@ apps/erpnext/erpnext/buying/report/purchase_analytics/purchase_analytics.js,base
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,ارسال بررسی
 DocType: Contract,Party User,کاربر حزب
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',لطفا مجموعه شرکت فیلتر خالی اگر گروه توسط است شرکت &#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,مجوز های ارسال و تاریخ نمی تواند تاریخ آینده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
 DocType: Loan Repayment,Interest Payable,بهره قابل پرداخت
@@ -6824,7 +6811,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,میانگین امتیازات
 DocType: Appointment,Appointment With,ملاقات با
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,مجموع مبلغ پرداختی در برنامه پرداخت باید برابر با مقدار Grand / Rounded باشد
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,حضور علامت گذاری به عنوان <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""ایتم مورد نظر مشتری"" 
 اعتبار کافی ندارد"
 DocType: Subscription Plan Detail,Plan,طرح
@@ -7498,7 +7484,6 @@ DocType: Item Customer Detail,Item Customer Detail,مورد جزئیات و ضو
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},حداکثر مبلغ مزیت کارمند {0} بیش از {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,مجموع برگ اختصاص داده بیش از روز در دوره
 DocType: Linked Soil Analysis,Linked Soil Analysis,تجزیه و تحلیل خاک مرتبط است
-DocType: Pricing Rule,Percentage,در صد
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,مورد {0} باید مورد سهام است
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش فرض کار در انبار پیشرفت
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",آیا برنامه هایی برای {0} همپوشانی را دنبال می کنید، پس از لغو شکاف های پوشیدنی، می خواهید؟

erpnext/translations/fi.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Ajanvarauspaikat
 DocType: Work Order Operation,Work In Progress,Työnalla
 DocType: Leave Control Panel,Branch (optional),Haara (valinnainen)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Valitse päivämäärä
-DocType: Item Price,Minimum Qty ,Vähimmäismäärä
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Vähimmäismäärä
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM-rekursio: {0} ei voi olla käyttäjän {1} lapsi
 DocType: Finance Book,Finance Book,Rahoituskirja
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,lomaluettelo
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Vanhempaa tiliä {0} ei ole
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Katsaus ja toiminta
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Tällä työntekijällä on jo loki samalla aikaleimalla. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Kirjanpitäjä
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Elä
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Voitto / tappio
 DocType: Crop,Perennial,Monivuotinen
 DocType: Program,Is Published,On julkaistu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Näytä toimitusilmoitukset
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",Päivitä "Yli laskutuskorvaus" Tilit-asetuksissa tai Kohteessa salliaksesi ylilaskutuksen.
 DocType: Patient Appointment,Procedure,menettely
 DocType: Accounts Settings,Use Custom Cash Flow Format,Käytä Custom Cash Flow -muotoa
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Riskitekijät
 DocType: Patient,Occupational Hazards and Environmental Factors,Työperäiset vaaratekijät ja ympäristötekijät
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Osakkeet, jotka on jo luotu työjärjestykseen"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Tuotekoodi> Tuoteryhmä> Tuotemerkki
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Katso aiemmat tilaukset
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} keskustelua
 DocType: Vital Signs,Respiratory rate,Hengitysnopeus
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Päivitysprosessissa tapahtui virhe
 DocType: Restaurant Reservation,Restaurant Reservation,Ravintolavaraus
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Tuotteet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Toimittaja> Toimittajan tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Ehdotus Kirjoittaminen
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment Entry Vähennys
 DocType: Service Level Priority,Service Level Priority,Palvelutaso prioriteettina
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Valitse Yritykset ja kirjauspäivämäärä saadaksesi merkinnät
 DocType: Asset,Maintenance,huolto
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Patient Encounterista
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM-muuntokerrointa ({0} -> {1}) ei löydy tuotteelle: {2}
 DocType: Subscriber,Subscriber,Tilaaja
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valuutanvaihtoa on sovellettava ostamiseen tai myyntiin.
@@ -1936,7 +1931,6 @@ DocType: Sales Invoice Item,Rate With Margin,Hinta kanssa marginaali
 DocType: Purchase Invoice,Is Return (Debit Note),Palautus (debit-huomautus)
 DocType: Workstation,Wages,Palkat
 DocType: Asset Maintenance,Maintenance Manager Name,Huoltopäällikön nimi
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Kauppoja yritystä vastaan on jo olemassa!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Pyydä sivustoa
 DocType: Agriculture Task,Urgent,Kiireellinen
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Haetaan tietueita ......
@@ -2633,7 +2627,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Maksuehto rivillä {0} on mahdollisesti kaksoiskappale.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Maatalous (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakkauslappu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset> Asetukset> Sarjasta nimeäminen -kohdassa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Toimisto Vuokra
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
 DocType: Disease,Common Name,Yleinen nimi
@@ -2799,7 +2792,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Vapaat kohdennettu {0}:lle
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,ei pakattavia tuotteita
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Vain .csv- ja .xlsx-tiedostoja tuetaan tällä hetkellä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit> HR-asetukset
 DocType: Shipping Rule Condition,From Value,arvosta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
 DocType: Loan,Repayment Method,lyhennystapa
@@ -4046,7 +4038,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,pyydetylle
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Jos tämä on valittuna, piilottaa ja poistaa käytöstä Pyöristetty kokonaisuus -kentän palkkalaskelmissa"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Tämä on oletusarvo (päivät) toimituspäivämäärälle myyntitilauksissa. Varakorvaus on 7 päivää tilauksen tekemispäivästä.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset> Numerointisarjat
 DocType: Rename Tool,File to Rename,Uudelleen nimettävä tiedosto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Hae tilauksen päivitykset
@@ -4649,7 +4640,6 @@ DocType: Healthcare Service Unit Type,Item Details,Tuotetiedot
 DocType: Cash Flow Mapping,Is Finance Cost,Onko rahoituskustannus
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
 DocType: Packing Slip,If more than one package of the same type (for print),mikäli useampi saman tyypin pakkaus (tulostus)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohtaan Koulutus> Koulutusasetukset
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Aseta oletusasiakas ravintolaasetuksissa
 ,Salary Register,Palkka Register
 DocType: Company,Default warehouse for Sales Return,Oletusvarasto myynnin palautusta varten
@@ -4920,7 +4910,6 @@ DocType: Item,Inspection Required before Purchase,Tarkastus Pakollinen ennen Pur
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Odottaa Aktiviteetit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Luo testi
 DocType: Patient Appointment,Reminded,muistutti
-DocType: Homepage Section,Cards,Kortit
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Näytä tilikartta
 DocType: Chapter Member,Chapter Member,Luku Jäsen
 DocType: Material Request Plan Item,Minimum Order Quantity,vähimmäistilausmäärä
@@ -4938,7 +4927,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Tulevat päivät eivät ole sallittuja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Odotettu toimituspäivä on myynnin tilauspäivän jälkeen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Täydennystilaustaso
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Tilikartta Template
+DocType: Company,Chart Of Accounts Template,Tilikartta Template
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Päivityksen on oltava mahdollinen ostolaskun {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Hinta päivitetty {0} in hinnasto {1}
@@ -5503,8 +5492,6 @@ DocType: Installation Note,Installation Date,asennuspäivä
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Osakekirja
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Myynti lasku {0} luotiin
 DocType: Employee,Confirmation Date,Työsopimuksen vahvistamispäivä
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Poista työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 DocType: Inpatient Occupancy,Check Out,Tarkista
 DocType: C-Form,Total Invoiced Amount,Kokonaislaskutus arvomäärä
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,min yksikkömäärä ei voi olla suurempi kuin max yksikkömäärä
@@ -5711,7 +5698,6 @@ DocType: Employee,Prefered Contact Email,Prefered Sähköpostiosoite
 DocType: Cheque Print Template,Cheque Width,Shekki Leveys
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validoi myyntihinta Tuote vastaan Purchase Rate tai arvostus Hinta
 DocType: Fee Schedule,Fee Schedule,Fee aikataulu
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Sarakkeen etiketit:
 DocType: Bank Transaction,Settled,ratkaistu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,parametrit
@@ -6385,6 +6371,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,O
 DocType: Salary Component,Formula,Kaava
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Sarja #
 DocType: Material Request Plan Item,Required Quantity,Vaadittu määrä
+DocType: Cash Flow Mapping Template,Template Name,Mallin nimi
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Tilikausi päällekkäin {0} kanssa
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Myynti tili
@@ -6445,7 +6432,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Tili {0}: emotili {1} ei kuulu yritykselle: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kuin Päivämäärä
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kuin Päivämäärä
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,ilmoittautuminen Date
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS -ilmoitukset
@@ -6511,7 +6498,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Tietokilpailu
 DocType: Subscription,Trial Period End Date,Trial Period End Date
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ei authroized koska {0} ylittää rajat
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Aloita tietojen syöttäminen täältä:
 DocType: Serial No,Asset Status,Omaisuuden tila
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Mittatikku (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Ravintola-taulukko
@@ -6737,7 +6723,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Lähe
 DocType: Contract,Party User,Party-käyttäjä
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,"Omaisuutta, jota ei ole luotu <b>{0}</b> . Omaisuus on luotava manuaalisesti."
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Aseta Yritysfiltteri tyhjäksi jos Ryhmittelyperuste on &#39;yritys&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Kirjoittamisen päivämäärä ei voi olla tulevaisuudessa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
 DocType: Loan Repayment,Interest Payable,Maksettava korko
@@ -6972,7 +6957,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Keskimääräinen hinta
 DocType: Appointment,Appointment With,Nimitys
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksun kokonaissumman summan on vastattava suurta / pyöristettyä summaa
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merkitse läsnäolo nimellä <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Asiakkaan toimittamalla tuotteella&quot; ei voi olla arviointiastetta
 DocType: Subscription Plan Detail,Plan,Suunnitelma
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Tiliote tasapaino kohti Pääkirja
@@ -7668,7 +7652,6 @@ DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Työntekijän {0} enimmäisetuuksien määrä ylittää {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Yhteensä myönnetty lehdet ovat enemmän kuin päivää kaudella
 DocType: Linked Soil Analysis,Linked Soil Analysis,Linkitetty maaperän analyysi
-DocType: Pricing Rule,Percentage,Prosentti
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Nimike {0} pitää olla varastonimike
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus KET-varasto
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Aikataulut {0} päällekkäisyyksillä, haluatko jatkaa päällekkäisten paikkojen tyhjentämisen jälkeen?"

erpnext/translations/fr.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Horaires de prise d
 DocType: Work Order Operation,Work In Progress,Travaux En Cours
 DocType: Leave Control Panel,Branch (optional),Branche (optionnel)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Veuillez sélectionner une date
-DocType: Item Price,Minimum Qty ,Quantité minimum
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Quantité minimum
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Récursion de nomenclature: {0} ne peut pas être enfant de {1}
 DocType: Finance Book,Finance Book,Livre comptable
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Liste de Vacances
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Le compte parent {0} n'existe pas
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Révision et action
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Cet employé a déjà un journal avec le même horodatage. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Comptable
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Fond
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Profit/perte
 DocType: Crop,Perennial,Vivace
 DocType: Program,Is Published,Est publié
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Afficher les notes de livraison
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Pour autoriser la facturation excédentaire, mettez à jour "Provision de facturation excédentaire" dans les paramètres de compte ou le poste."
 DocType: Patient Appointment,Procedure,Procédure
 DocType: Accounts Settings,Use Custom Cash Flow Format,Utiliser le format de flux de trésorerie personnalisé
@@ -982,7 +980,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Facteurs de Risque
 DocType: Patient,Occupational Hazards and Environmental Factors,Dangers Professionnels et Facteurs Environnementaux
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Ecritures de stock déjà créées pour l'ordre de travail
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Code article> Groupe d'articles> Marque
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Voir les commandes passées
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} conversations
 DocType: Vital Signs,Respiratory rate,Fréquence Respiratoire
@@ -1140,7 +1137,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Une erreur s'est produite lors du processus de mise à jour
 DocType: Restaurant Reservation,Restaurant Reservation,Réservation de restaurant
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vos articles
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Fournisseur> Type de fournisseur
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Rédaction de Propositions
 DocType: Payment Entry Deduction,Payment Entry Deduction,Déduction d’Écriture de Paiement
 DocType: Service Level Priority,Service Level Priority,Priorité de niveau de service
@@ -1439,7 +1435,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Veuillez sélectionner la société et la date de comptabilisation pour obtenir les écritures
 DocType: Asset,Maintenance,Entretien
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Obtenez de la rencontre du patient
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Facteur de conversion UdM ({0} -> {1}) introuvable pour l'article: {2}
 DocType: Subscriber,Subscriber,Abonné
 DocType: Item Attribute Value,Item Attribute Value,Valeur de l'Attribut de l'Article
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Le taux de change doit être applicable à l'achat ou la vente.
@@ -1957,7 +1952,6 @@ DocType: Sales Invoice Item,Rate With Margin,Tarif Avec Marge
 DocType: Purchase Invoice,Is Return (Debit Note),Est une note de débit
 DocType: Workstation,Wages,Salaires
 DocType: Asset Maintenance,Maintenance Manager Name,Nom du responsable de la maintenance
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Les transactions avec l'entreprise existent déjà!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Site demandeur
 DocType: Agriculture Task,Urgent,Urgent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Récupération des enregistrements ......
@@ -2654,7 +2648,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Le délai de paiement à la ligne {0} est probablement un doublon.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Agriculture (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Bordereau de Colis
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Veuillez définir la série de noms pour {0} via Configuration> Paramètres> Série de noms
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Loyer du Bureau
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Configuration de la passerelle SMS
 DocType: Disease,Common Name,Nom commun
@@ -2820,7 +2813,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Congés Attribués avec Succès pour {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Pas d’Articles à emballer
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Seuls les fichiers .csv et .xlsx sont actuellement pris en charge.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines> Paramètres RH
 DocType: Shipping Rule Condition,From Value,De la Valeur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Quantité de production obligatoire
 DocType: Loan,Repayment Method,Méthode de Remboursement
@@ -4068,7 +4060,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Requis Pour
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Si coché, masque et désactive le champ Total arrondi dans les fiches de salaire"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Il s'agit du décalage par défaut (jours) pour la date de livraison dans les commandes client. La compensation de repli est de 7 jours à compter de la date de passation de la commande.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Veuillez configurer la série de numérotation pour l'assistance via Configuration> Série de numérotation
 DocType: Rename Tool,File to Rename,Fichier à Renommer
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Veuillez sélectionnez une LDM pour l’Article à la Ligne {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Vérifier les mises à jour des abonnements
@@ -4703,7 +4694,6 @@ DocType: Healthcare Service Unit Type,Item Details,Détails d'article
 DocType: Cash Flow Mapping,Is Finance Cost,Est un coût financier
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,La présence de l'employé {0} est déjà marquée
 DocType: Packing Slip,If more than one package of the same type (for print),Si plus d'un paquet du même type (pour l'impression)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Veuillez configurer le système de dénomination de l'instructeur dans Éducation> Paramètres de l'éducation
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Veuillez définir le client par défaut dans les paramètres du restaurant
 ,Salary Register,Registre du Salaire
 DocType: Company,Default warehouse for Sales Return,Magasin par défaut pour retour de vente
@@ -4974,7 +4964,6 @@ DocType: Item,Inspection Required before Purchase,Inspection Requise avant Achat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Activités en Attente
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Créer un test de laboratoire
 DocType: Patient Appointment,Reminded,Rappelé
-DocType: Homepage Section,Cards,Cartes
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Voir le plan comptable
 DocType: Chapter Member,Chapter Member,Membre du chapitre
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantité minimale d'achat
@@ -4992,7 +4981,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Dates futures non autorisées
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La Date de Livraison Prévue doit être après la Date indiquée sur le Bon de Commande de Vente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Niveau de Réapprovisionnement
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Modèle de Plan Comptable
+DocType: Company,Chart Of Accounts Template,Modèle de Plan Comptable
 DocType: Attendance,Attendance Date,Date de Présence
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},La mise à jour du stock doit être activée pour la facture d'achat {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Prix de l'Article mis à jour pour {0} dans la Liste des Prix {1}
@@ -5557,8 +5546,6 @@ DocType: Installation Note,Installation Date,Date d'Installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Registre des actions
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Facture de Vente {0} créée
 DocType: Employee,Confirmation Date,Date de Confirmation
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Veuillez supprimer l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document"
 DocType: Inpatient Occupancy,Check Out,Départ
 DocType: C-Form,Total Invoiced Amount,Montant Total Facturé
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Qté Min ne peut pas être supérieure à Qté Max
@@ -5765,7 +5752,6 @@ DocType: Employee,Prefered Contact Email,Email de Contact Préféré
 DocType: Cheque Print Template,Cheque Width,Largeur du Chèque
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Valider le Prix de Vente de l'Article avec le Prix d'Achat ou le Taux de Valorisation
 DocType: Fee Schedule,Fee Schedule,Barème d'Honoraires
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Étiquettes de colonne:
 DocType: Bank Transaction,Settled,Colonisé
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cesser
 DocType: Quality Feedback,Parameters,Paramètres
@@ -6439,6 +6425,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,V
 DocType: Salary Component,Formula,Formule
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Série #
 DocType: Material Request Plan Item,Required Quantity,Quantité requise
+DocType: Cash Flow Mapping Template,Template Name,Nom du Modèle
 DocType: Lab Test Template,Lab Test Template,Modèle de test de laboratoire
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},La période comptable chevauche avec {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Compte de vente
@@ -6499,7 +6486,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Date du Chèque
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: Le Compte parent {1} n'appartient pas à l'entreprise: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Suppression de toutes les transactions liées à cette société avec succès !
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Comme à la date
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Comme à la date
 DocType: Additional Salary,HR,RH
 DocType: Course Enrollment,Enrollment Date,Date de l'Inscription
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alertes SMS pour Patients
@@ -6565,7 +6552,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Quiz
 DocType: Subscription,Trial Period End Date,Date de fin de la période d&#39;évaluation
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Non autorisé car {0} dépasse les limites
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Commencez à saisir des données à partir d&#39;ici:
 DocType: Serial No,Asset Status,Statut de l&#39;actif
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Cargaison hors dimension (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Table de restaurant
@@ -6791,7 +6777,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Poste
 DocType: Contract,Party User,Utilisateur tiers
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Éléments non créés pour <b>{0}</b> . Vous devrez créer l&#39;actif manuellement.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Veuillez laisser le filtre de la Société vide si Group By est 'Société'
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,La Date de Publication ne peut pas être une date future
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0} : N° de série {1} ne correspond pas à {2} {3}
 DocType: Loan Repayment,Interest Payable,Intérêts payables
@@ -7026,7 +7011,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Prix moyen
 DocType: Appointment,Appointment With,Rendez-vous avec
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Le montant total du paiement dans l'échéancier doit être égal au Total Général / Total Arrondi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marquer la présence comme <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Un ""article fourni par un client"" ne peut pas avoir de taux de valorisation"
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Solde du Relevé Bancaire d’après le Grand Livre
@@ -7718,7 +7702,6 @@ DocType: Item Customer Detail,Item Customer Detail,Détail de l'Article Client
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Le montant maximal des prestations sociales de l'employé {0} dépasse {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Le Total des feuilles attribuées est supérieur au nombre de jours dans la période
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analyse de sol liée
-DocType: Pricing Rule,Percentage,Pourcentage
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,L'article {0} doit être un article en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Entrepôt de Travail en Cours par Défaut
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Les plannings pour {0} se chevauchent, voulez-vous continuer sans prendre en compte les créneaux qui se chevauchent ?"

erpnext/translations/gu.csv

@@ -167,11 +167,10 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,નિમણૂક
 DocType: Work Order Operation,Work In Progress,પ્રગતિમાં કામ
 DocType: Leave Control Panel,Branch (optional),શાખા (વૈકલ્પિક)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,કૃપા કરીને તારીખ પસંદ
-DocType: Item Price,Minimum Qty ,ન્યૂનતમ જથ્થો
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,ન્યૂનતમ જથ્થો
 DocType: Finance Book,Finance Book,ફાઇનાન્સ બુક
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,એચએલસી-ઇએનસી-. યેવાયવાય.-
 DocType: Appointment Booking Settings,Holiday List,રજા યાદી
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,પેરેંટ એકાઉન્ટ {0} અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,સમીક્ષા અને ક્રિયા
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},આ કર્મચારીનો સમાન ટાઇમસ્ટેમ્પ સાથે પહેલેથી જ લોગ છે. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,એકાઉન્ટન્ટ
@@ -243,7 +242,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,પ
 DocType: Exchange Rate Revaluation Account,Gain/Loss,લાભ / નુકસાન
 DocType: Crop,Perennial,બારમાસી
 DocType: Program,Is Published,પ્રકાશિત થયેલ છે
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,ડિલિવરી નોટ્સ બતાવો
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","વધુ બિલિંગને મંજૂરી આપવા માટે, એકાઉન્ટ્સ સેટિંગ્સ અથવા આઇટમમાં "ઓવર બિલિંગ એલાઉન્સ" અપડેટ કરો."
 DocType: Patient Appointment,Procedure,કાર્યવાહી
 DocType: Accounts Settings,Use Custom Cash Flow Format,કસ્ટમ કેશ ફ્લો ફોર્મેટનો ઉપયોગ કરો
@@ -964,7 +962,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,જોખમ પરિબળો
 DocType: Patient,Occupational Hazards and Environmental Factors,વ્યવસાય જોખમો અને પર્યાવરણીય પરિબળો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,સ્ટોક્સ એન્ટ્રીઝ પહેલેથી જ વર્ક ઓર્ડર માટે બનાવેલ છે
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,આઇટમ કોડ> આઇટમ જૂથ> બ્રાન્ડ
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,પાછલા ઓર્ડર જુઓ
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} વાતચીત
 DocType: Vital Signs,Respiratory rate,શ્વસન દર
@@ -1119,7 +1116,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,અપડેટ પ્રક્રિયા દરમિયાન ભૂલ આવી
 DocType: Restaurant Reservation,Restaurant Reservation,રેસ્ટોરન્ટ રિઝર્વેશન
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,તમારી આઇટમ્સ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,સપ્લાયર> સપ્લાયર પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,દરખાસ્ત લેખન
 DocType: Payment Entry Deduction,Payment Entry Deduction,ચુકવણી એન્ટ્રી કપાત
 DocType: Service Level Priority,Service Level Priority,સેવા સ્તરની પ્રાધાન્યતા
@@ -1414,7 +1410,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,પ્રવેશ મેળવવા માટેની કંપની અને પોસ્ટિંગ તારીખ પસંદ કરો
 DocType: Asset,Maintenance,જાળવણી
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,પેશન્ટ એન્કાઉન્ટરમાંથી મેળવો
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -> {1}) મળ્યું નથી: {2}
 DocType: Subscriber,Subscriber,ઉપભોક્તા
 DocType: Item Attribute Value,Item Attribute Value,વસ્તુ કિંમત એટ્રીબ્યુટ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,ખરીદ અથવા વેચાણ માટે કરન્સી એક્સચેન્જ લાગુ હોવું આવશ્યક છે.
@@ -1906,7 +1901,6 @@ DocType: Sales Invoice Item,Rate With Margin,માર્જિનથી દર
 DocType: Purchase Invoice,Is Return (Debit Note),રીટર્ન છે (ડેબિટ નોંધ)
 DocType: Workstation,Wages,વેતન
 DocType: Asset Maintenance,Maintenance Manager Name,જાળવણી વ્યવસ્થાપક નામ
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,કંપની સામે ટ્રાન્ઝેક્શન પહેલાથી જ અસ્તિત્વમાં છે!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,વિનંતી સાઇટ
 DocType: Agriculture Task,Urgent,અર્જન્ટ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,રેકોર્ડ્સ લાવવામાં ......
@@ -2748,7 +2742,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},માટે સફળતાપૂર્વક સોંપાયેલ પાંદડાઓ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,કોઈ વસ્તુઓ પૅક કરવા માટે
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,હાલમાં ફક્ત .csv અને .xlsx ફાઇલો સપોર્ટેડ છે
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,કૃપા કરીને માનવ સંસાધન> એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Shipping Rule Condition,From Value,ભાવ પ્રતિ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,ઉત્પાદન જથ્થો ફરજિયાત છે
 DocType: Loan,Repayment Method,ચુકવણી પદ્ધતિ
@@ -3961,7 +3954,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,જરૂરી પર
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","જો ચકાસાયેલ હોય, તો પગાર સ્લિપ્સમાં ગોળાકાર કુલ ફીલ્ડ છુપાવે છે અને અક્ષમ કરે છે"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,વેચાણના ઓર્ડર્સમાં ડિલિવરીની તારીખ માટે આ ડિફ defaultલ્ટ setફસેટ (દિવસો) છે. ફ fallલબેક setફસેટ placeર્ડર પ્લેસમેન્ટની તારીખથી 7 દિવસની છે.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,કૃપા કરીને સેટઅપ> નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 DocType: Rename Tool,File to Rename,નામ ફાઇલ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,ઉમેદવારી સુધારાઓ મેળવો
@@ -4554,7 +4546,6 @@ DocType: Healthcare Service Unit Type,Item Details,આઇટમ વિગતો
 DocType: Cash Flow Mapping,Is Finance Cost,નાણા ખર્ચ છે
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,કર્મચારી {0} માટે હાજરી પહેલેથી ચિહ્નિત થયેલ છે
 DocType: Packing Slip,If more than one package of the same type (for print),જો એક જ પ્રકારના એક કરતાં વધુ પેકેજ (પ્રિન્ટ માટે)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,કૃપા કરીને શિક્ષણ> શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,કૃપા કરીને રેસ્ટોરેન્ટ સેટિંગ્સમાં ડિફોલ્ટ ગ્રાહક સેટ કરો
 ,Salary Register,પગાર રજિસ્ટર
 DocType: Company,Default warehouse for Sales Return,સેલ્સ રીટર્ન માટે ડિફોલ્ટ વેરહાઉસ
@@ -4820,7 +4811,6 @@ DocType: Item,Inspection Required before Purchase,નિરીક્ષણ ખ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,બાકી પ્રવૃત્તિઓ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,લેબ પરીક્ષણ બનાવો
 DocType: Patient Appointment,Reminded,યાદ કરાવ્યું
-DocType: Homepage Section,Cards,કાર્ડ્સ
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,ચાર્ટ્સ ઓફ એકાઉન્ટ્સ જુઓ
 DocType: Chapter Member,Chapter Member,પ્રકરણનો સભ્ય
 DocType: Material Request Plan Item,Minimum Order Quantity,ન્યુનત્તમ ઓર્ડર જથ્થો
@@ -4836,7 +4826,7 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Newspaper Publishe
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,ભાવિ તારીખોની મંજૂરી નથી
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,અપેક્ષિત ડિલિવરી તારીખ સેલ્સ ઑર્ડર તારીખ પછી હોવી જોઈએ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,પુનઃક્રમાંકિત કરો સ્તર
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,એકાઉન્ટ્સ ઢાંચો ચાર્ટ
+DocType: Company,Chart Of Accounts Template,એકાઉન્ટ્સ ઢાંચો ચાર્ટ
 DocType: Attendance,Attendance Date,એટેન્ડન્સ તારીખ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},સુધારા શેર ખરીદી ભરતિયું માટે સક્ષમ હોવું જ જોઈએ {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},વસ્તુ ભાવ {0} માં ભાવ યાદી માટે સુધારાશે {1}
@@ -5393,8 +5383,6 @@ DocType: Installation Note,Installation Date,સ્થાપન તારીખ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,લેજર શેર કરો
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,સેલ્સ ઇન્વોઇસ {0} બનાવી
 DocType: Employee,Confirmation Date,સમર્થન તારીખ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","કૃપા કરીને આ દસ્તાવેજ રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> delete કા deleteી નાખો"
 DocType: Inpatient Occupancy,Check Out,તપાસો
 DocType: C-Form,Total Invoiced Amount,કુલ ભરતિયું રકમ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,મીન Qty મેક્સ Qty કરતાં વધારે ન હોઈ શકે
@@ -5595,7 +5583,6 @@ DocType: Employee,Prefered Contact Email,Prefered સંપર્ક ઇમે
 DocType: Cheque Print Template,Cheque Width,ચેક પહોળાઈ
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,માન્ય વેચાણ કિંમત ખરીદી દર અથવા મૂલ્યાંકન દર સામે વસ્તુ
 DocType: Fee Schedule,Fee Schedule,ફી સૂચિ
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,કumnલમ લેબલ્સ:
 DocType: Bank Transaction,Settled,સ્થાયી થયા
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,સેસ
 DocType: Quality Feedback,Parameters,પરિમાણો
@@ -6258,6 +6245,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,ફોર્મ્યુલા
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,સીરીયલ #
 DocType: Material Request Plan Item,Required Quantity,જરૂરી માત્રા
+DocType: Cash Flow Mapping Template,Template Name,નમૂના નામ
 DocType: Lab Test Template,Lab Test Template,લેબ ટેસ્ટ ઢાંચો
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,સેલ્સ એકાઉન્ટ
 DocType: Purchase Invoice Item,Total Weight,કૂલ વજન
@@ -6316,7 +6304,7 @@ DocType: Supplier,SUP-.YYYY.-,એસયુપી- YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,ચેક તારીખ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} કંપની ને અનુલક્ષતું નથી: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,તારીખના રોજ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,તારીખના રોજ
 DocType: Additional Salary,HR,એચઆર
 DocType: Course Enrollment,Enrollment Date,નોંધણી તારીખ
 DocType: Healthcare Settings,Out Patient SMS Alerts,પેશન્ટ એસએમએસ ચેતવણીઓ
@@ -6381,7 +6369,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,ક્વિઝ
 DocType: Subscription,Trial Period End Date,ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,"{0} મર્યાદા કરતાં વધી જાય છે, કારણ કે authroized નથી"
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,અહીંથી ડેટા દાખલ કરવાનું પ્રારંભ કરો:
 DocType: Serial No,Asset Status,અસેટ સ્થિતિ
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),ડાયમેન્શનલ કાર્ગો (ઓડીસી) ઉપર
 DocType: Restaurant Order Entry,Restaurant Table,રેસ્ટોરન્ટ ટેબલ
@@ -6602,7 +6589,6 @@ apps/erpnext/erpnext/buying/report/purchase_analytics/purchase_analytics.js,base
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,સમીક્ષા સબમિટ કરો
 DocType: Contract,Party User,પાર્ટી યુઝર
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',કૃપા કરીને કંપની ખાલી ફિલ્ટર સેટ જો ગ્રુપ દ્વારા &#39;કંપની&#39; છે
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,પોસ્ટ તારીખ ભવિષ્યના તારીખ ન હોઈ શકે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
 DocType: Loan Repayment,Interest Payable,વ્યાજ ચૂકવવાપાત્ર
@@ -6834,7 +6820,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,સરેરાશ દર
 DocType: Appointment,Appointment With,સાથે નિમણૂક
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,પેમેન્ટ સુનિશ્ચિતમાં કુલ ચૂકવણીની રકમ ગ્રાન્ડ / ગોળાકાર કુલની સમકક્ષ હોવી જોઈએ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,તરીકે હાજરી માર્ક કરો <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""ગ્રાહક મોકલેલ વસ્તુ""  ""મૂલ્યાંકન દર ન હોઈ શકે"
 DocType: Subscription Plan Detail,Plan,યોજના
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,સામાન્ય ખાતાવહી મુજબ બેન્ક નિવેદન બેલેન્સ
@@ -7509,7 +7494,6 @@ DocType: Item Customer Detail,Item Customer Detail,વસ્તુ ગ્રા
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},કર્મચારીનું મહત્તમ લાભ રકમ {0} વધી જાય છે {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,કુલ ફાળવેલ પાંદડા સમયગાળામાં દિવસો કરતાં વધુ છે
 DocType: Linked Soil Analysis,Linked Soil Analysis,લિંક કરેલી જમીન વિશ્લેષણ
-DocType: Pricing Rule,Percentage,ટકાવારી
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,વસ્તુ {0} સ્ટોક વસ્તુ જ હોવી જોઈએ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,પ્રગતિ વેરહાઉસ માં મૂળભૂત કામ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","{0} ઓવરલેપ માટે શેડ્યૂલ, શું તમે ઓવરલેપ કરેલ સ્લોટ્સને છોડીને આગળ વધવા માંગો છો?"

erpnext/translations/he.csv

@@ -2207,7 +2207,7 @@ DocType: Packing Slip,The gross weight of the package. Usually net weight + pack
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","לעזוב לא יכול להיות מוקצה לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
 DocType: Pricing Rule,"Higher the number, higher the priority","ככל שהמספר גבוה, גבוה בראש סדר העדיפויות"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,כבתאריך
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,כבתאריך
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: POS Profile,Write Off Cost Center,לכתוב את מרכז עלות
 DocType: Leave Control Panel,Allocate,להקצות
@@ -2770,7 +2770,6 @@ DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},כמות לפריט {0} חייבת להיות פחות מ {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
-DocType: Pricing Rule,Percentage,אֲחוּזִים
 DocType: Payment Request,Make Sales Invoice,הפוך מכירות חשבונית
 DocType: Quality Inspection Reading,Reading 9,קריאת 9
 DocType: Target Detail,Target Detail,פרט היעד

erpnext/translations/hi.csv

@@ -166,12 +166,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,नियुक्
 DocType: Work Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
 DocType: Leave Control Panel,Branch (optional),शाखा (वैकल्पिक)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,कृपया तिथि का चयन
-DocType: Item Price,Minimum Qty ,न्यूनतम मात्रा
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,न्यूनतम मात्रा
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM पुनरावर्तन: {0} {1} का बच्चा नहीं हो सकता
 DocType: Finance Book,Finance Book,वित्त पुस्तक
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,उच्च स्तरीय समिति-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,अवकाश सूची
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,मूल खाता {0} मौजूद नहीं है
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,समीक्षा और कार्रवाई
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},इस कर्मचारी के पास पहले से ही समान टाइमस्टैम्प है। {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,मुनीम
@@ -243,7 +242,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,प
 DocType: Exchange Rate Revaluation Account,Gain/Loss,लाभ हानि
 DocType: Crop,Perennial,चिरस्थायी
 DocType: Program,Is Published,प्रकाशित है
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,वितरण नोट दिखाएं
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","बिलिंग की अनुमति देने के लिए, खाता सेटिंग या आइटम में "ओवर बिलिंग बिलिंग भत्ता" अपडेट करें।"
 DocType: Patient Appointment,Procedure,प्रक्रिया
 DocType: Accounts Settings,Use Custom Cash Flow Format,कस्टम कैश फ्लो प्रारूप का उपयोग करें
@@ -978,7 +976,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,जोखिम के कारण
 DocType: Patient,Occupational Hazards and Environmental Factors,व्यावसायिक खतरों और पर्यावरणीय कारक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,स्टॉक प्रविष्टियां पहले से ही कार्य आदेश के लिए बनाई गई हैं
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,आइटम कोड> आइटम समूह> ब्रांड
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,पिछले आदेश देखें
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} बातचीत
 DocType: Vital Signs,Respiratory rate,श्वसन दर
@@ -1136,7 +1133,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,अद्यतन प्रक्रिया के दौरान एक त्रुटि हुई
 DocType: Restaurant Reservation,Restaurant Reservation,रेस्तरां आरक्षण
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,आपके आइटम
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,आपूर्तिकर्ता> आपूर्तिकर्ता प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भुगतान एंट्री कटौती
 DocType: Service Level Priority,Service Level Priority,सेवा स्तर की प्राथमिकता
@@ -1435,7 +1431,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,कृपया प्रविष्टियां प्राप्त करने के लिए कंपनी और पोस्टिंग तिथि का चयन करें
 DocType: Asset,Maintenance,रखरखाव
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,रोगी मुठभेड़ से प्राप्त करें
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -> {1}) आइटम के लिए नहीं मिला: {2}
 DocType: Subscriber,Subscriber,ग्राहक
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,ख़रीदना या बेचना के लिए मुद्रा विनिमय लागू होना चाहिए।
@@ -1952,7 +1947,6 @@ DocType: Sales Invoice Item,Rate With Margin,मार्जिन के सा
 DocType: Purchase Invoice,Is Return (Debit Note),वापसी है (डेबिट नोट)
 DocType: Workstation,Wages,वेतन
 DocType: Asset Maintenance,Maintenance Manager Name,रखरखाव प्रबंधक नाम
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,कंपनी के खिलाफ लेनदेन पहले से मौजूद हैं!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,अनुरोध स्थल
 DocType: Agriculture Task,Urgent,अत्यावश्यक
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,रिकॉर्ड प्राप्त कर रहा है ......
@@ -2650,7 +2644,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,{0} पंक्ति में भुगतान अवधि संभवतः एक डुप्लिकेट है
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),कृषि (बीटा)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,पर्ची पैकिंग
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,कृपया सेटिंग> सेटिंग> नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला निर्धारित करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
 DocType: Disease,Common Name,साधारण नाम
@@ -2816,7 +2809,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,वर्तमान में केवल .csv और .xlsx फाइलें ही समर्थित हैं
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,कृपया मानव संसाधन> HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 DocType: Shipping Rule Condition,From Value,मूल्य से
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
 DocType: Loan,Repayment Method,चुकौती विधि
@@ -4062,7 +4054,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,आवश्यक पर
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","यदि जाँच की जाए, तो छिपी हुई है और वेतन पर्ची में गोल क्षेत्र को निष्क्रिय करता है"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,यह बिक्री आदेशों में डिलीवरी की तारीख के लिए डिफ़ॉल्ट ऑफसेट (दिन) है। ऑर्डर प्लेसमेंट की तारीख से 7 दिन की गिरावट है।
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,कृपया सेटअप> नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,सदस्यता अपडेट प्राप्त करें
@@ -4697,7 +4688,6 @@ DocType: Healthcare Service Unit Type,Item Details,आइटम विवरण
 DocType: Cash Flow Mapping,Is Finance Cost,वित्त लागत है
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
 DocType: Packing Slip,If more than one package of the same type (for print),यदि एक ही प्रकार के एक से अधिक पैकेज (प्रिंट के लिए)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,कृपया शिक्षा> शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,कृपया रेस्तरां सेटिंग में डिफ़ॉल्ट ग्राहक सेट करें
 ,Salary Register,वेतन रजिस्टर
 DocType: Company,Default warehouse for Sales Return,बिक्री रिटर्न के लिए डिफ़ॉल्ट गोदाम
@@ -4968,7 +4958,6 @@ DocType: Item,Inspection Required before Purchase,निरीक्षण ख
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,गतिविधियों में लंबित
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,लैब टेस्ट बनाएं
 DocType: Patient Appointment,Reminded,याद दिलाया
-DocType: Homepage Section,Cards,पत्ते
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,खातों का चार्ट देखें
 DocType: Chapter Member,Chapter Member,अध्याय सदस्य
 DocType: Material Request Plan Item,Minimum Order Quantity,न्यूनतम आदेश मात्रा
@@ -4986,7 +4975,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,भविष्य की तारीखों की अनुमति नहीं है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,अपेक्षित वितरण तिथि बिक्री आदेश तिथि के बाद होनी चाहिए
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,स्तर पुनः क्रमित करें
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,लेखा खाका का चार्ट
+DocType: Company,Chart Of Accounts Template,लेखा खाका का चार्ट
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},अद्यतन चालान खरीद चालान के लिए सक्षम होना चाहिए {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},आइटम की {0} में मूल्य सूची के लिए अद्यतन {1}
@@ -5551,8 +5540,6 @@ DocType: Installation Note,Installation Date,स्थापना की ता
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,लेजर शेयर करें
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,बिक्री चालान {0} बनाया गया
 DocType: Employee,Confirmation Date,पुष्टिकरण तिथि
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","कृपया इस दस्तावेज़ को रद्द करने के लिए कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ _ हटाएं"
 DocType: Inpatient Occupancy,Check Out,चेक आउट
 DocType: C-Form,Total Invoiced Amount,कुल चालान राशि
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,न्यूनतम मात्रा अधिकतम मात्रा से ज्यादा नहीं हो सकता
@@ -5759,7 +5746,6 @@ DocType: Employee,Prefered Contact Email,पसंद संपर्क ईम
 DocType: Cheque Print Template,Cheque Width,चैक चौड़ाई
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,मान्य बिक्री मूल्य खरीद दर या मूल्यांकन दर के खिलाफ मद के लिए
 DocType: Fee Schedule,Fee Schedule,शुल्क अनुसूची
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,कॉलम लेबल:
 DocType: Bank Transaction,Settled,बसे हुए
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,उपकर
 DocType: Quality Feedback,Parameters,पैरामीटर
@@ -6433,6 +6419,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,
 DocType: Salary Component,Formula,सूत्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,सीरियल #
 DocType: Material Request Plan Item,Required Quantity,आवश्यक मात्रा
+DocType: Cash Flow Mapping Template,Template Name,टेम्पलेट नाम
 DocType: Lab Test Template,Lab Test Template,लैब टेस्ट टेम्पलेट
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},लेखांकन अवधि {0} के साथ ओवरलैप होती है
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,विक्रय खाता
@@ -6493,7 +6480,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,आज की तारीख में
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,आज की तारीख में
 DocType: Additional Salary,HR,मानव संसाधन
 DocType: Course Enrollment,Enrollment Date,नामांकन तिथि
 DocType: Healthcare Settings,Out Patient SMS Alerts,बाहर रोगी एसएमएस अलर्ट
@@ -6559,7 +6546,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,प्रश्नोत्तरी
 DocType: Subscription,Trial Period End Date,परीक्षण अवधि समाप्ति तिथि
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,{0} सीमा से अधिक के बाद से Authroized नहीं
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,यहां से डेटा दर्ज करना शुरू करें:
 DocType: Serial No,Asset Status,संपत्ति की स्थिति
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),आयामी कार्गो (ओडीसी) से अधिक
 DocType: Restaurant Order Entry,Restaurant Table,रेस्टोरेंट टेबल
@@ -6786,7 +6772,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,स
 DocType: Contract,Party User,पार्टी उपयोगकर्ता
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,<b>{0}</b> के लिए एसेट्स नहीं बनाए गए। आपको मैन्युअल रूप से संपत्ति बनानी होगी।
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',अगर ग्रुप बाय &#39;कंपनी&#39; है तो कंपनी को फिल्टर रिक्त करें
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,पोस्ट दिनांक भविष्य की तारीख नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
 DocType: Loan Repayment,Interest Payable,देय ब्याज
@@ -7021,7 +7006,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,सामान्य दर
 DocType: Appointment,Appointment With,इनके साथ अपॉइंटमेंट
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,भुगतान शेड्यूल में कुल भुगतान राशि ग्रैंड / गोल की कुल राशि के बराबर होनी चाहिए
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,मार्क उपस्थिति के रूप में <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;ग्राहक प्रदान की गई वस्तु&quot; में मूल्यांकन दर नहीं हो सकती है
 DocType: Subscription Plan Detail,Plan,योजना
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,जनरल लेजर के अनुसार बैंक बैलेंस
@@ -7712,7 +7696,6 @@ DocType: Item Customer Detail,Item Customer Detail,आइटम ग्राह
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},कर्मचारी की अधिकतम लाभ राशि {0} से अधिक है {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,कुल आवंटित पत्ते अवधि में दिनों की तुलना में अधिक कर रहे हैं
 DocType: Linked Soil Analysis,Linked Soil Analysis,लिंक किए गए मृदा विश्लेषण
-DocType: Pricing Rule,Percentage,का प्रतिशत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,आइटम {0} भंडार वस्तु होना चाहिए
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगति गोदाम में डिफ़ॉल्ट वर्क
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","{0} ओवरलैप के लिए अनुसूची, क्या आप ओवरलैप किए गए स्लॉट को छोड़ने के बाद आगे बढ़ना चाहते हैं?"

erpnext/translations/hr.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Slotovi za rezervac
 DocType: Work Order Operation,Work In Progress,Radovi u tijeku
 DocType: Leave Control Panel,Branch (optional),Podružnica (izborno)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Odaberite datum
-DocType: Item Price,Minimum Qty ,Minimalni broj
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimalni broj
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM rekurzija: {0} ne može biti dijete od {1}
 DocType: Finance Book,Finance Book,Financijska knjiga
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,FHP-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Popis praznika
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Roditeljski račun {0} ne postoji
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pregled i radnja
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ovaj zaposlenik već ima zapisnik s istim vremenskim žigom. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Knjigovođa
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Miro
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Dobit / Gubitak
 DocType: Crop,Perennial,višegodišnji
 DocType: Program,Is Published,Objavljeno je
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Prikaži bilješke o isporuci
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Da biste omogućili prekomerno naplaćivanje, ažurirajte "Nadoplata za naplatu" u Postavkama računa ili Stavka."
 DocType: Patient Appointment,Procedure,Postupak
 DocType: Accounts Settings,Use Custom Cash Flow Format,Koristite prilagođeni format novčanog toka
@@ -981,7 +979,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Faktori rizika
 DocType: Patient,Occupational Hazards and Environmental Factors,Radna opasnost i čimbenici okoliša
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Dionice već stvorene za radni nalog
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kod artikla> Grupa artikala> Marka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Pogledajte prošle narudžbe
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} razgovora
 DocType: Vital Signs,Respiratory rate,Brzina dišnog sustava
@@ -1139,7 +1136,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Došlo je do pogreške tijekom postupka ažuriranja
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vaše stavke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Dobavljač> vrsta dobavljača
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Ulaz Odbitak
 DocType: Service Level Priority,Service Level Priority,Prioritet na razini usluge
@@ -1438,7 +1434,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Odaberite unos za tvrtku i datum knjiženja
 DocType: Asset,Maintenance,Održavanje
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Dobiti od Patient Encounter
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor konverzije UOM ({0} -> {1}) nije pronađen za stavku: {2}
 DocType: Subscriber,Subscriber,Pretplatnik
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Mjenjač mora biti primjenjiv za kupnju ili prodaju.
@@ -1955,7 +1950,6 @@ DocType: Sales Invoice Item,Rate With Margin,Ocijenite s marginom
 DocType: Purchase Invoice,Is Return (Debit Note),Je li povrat (debitna bilješka)
 DocType: Workstation,Wages,Plaće
 DocType: Asset Maintenance,Maintenance Manager Name,Ime upravitelja održavanja
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakcije protiv tvrtke već postoje!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Podnositelj zahtjeva
 DocType: Agriculture Task,Urgent,Hitan
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Dohvaćanje zapisa ......
@@ -2653,7 +2647,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Plaćanje u redu {0} vjerojatno je duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Poljoprivreda (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Odreskom
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Postavite Nameing Series za {0} putem Postavke> Postavke> Imenovanje serija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Postavke SMS pristupnika
 DocType: Disease,Common Name,Uobičajeno ime
@@ -2819,7 +2812,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Odsustvo uspješno dodijeljeno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Nema proizvoda za pakiranje
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Trenutno su podržane samo .csv i .xlsx datoteke
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi> HR postavke
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
 DocType: Loan,Repayment Method,Način otplate
@@ -4066,7 +4058,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Potrebna On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ako je označeno, sakriva i onemogućuje polje Zaokruženo ukupno u listićima plaće"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Ovo je zadani offset (dani) za datum isporuke u prodajnim narudžbama. Ponovno nadoknađivanje iznosi 7 dana od datuma slanja narudžbe.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Postavite brojevnu seriju za Attendance putem Postavljanje> Numeriranje
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Dohvati ažuriranja pretplate
@@ -4700,7 +4691,6 @@ DocType: Healthcare Service Unit Type,Item Details,Detalji artikla
 DocType: Cash Flow Mapping,Is Finance Cost,Je li trošak financiranja
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje> Postavke obrazovanja
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Postavite zadani klijent u Postavkama restorana
 ,Salary Register,Plaća Registracija
 DocType: Company,Default warehouse for Sales Return,Zadano skladište za povrat prodaje
@@ -4971,7 +4961,6 @@ DocType: Item,Inspection Required before Purchase,Inspekcija Obavezno prije kupn
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Aktivnosti na čekanju
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Napravite laboratorijski test
 DocType: Patient Appointment,Reminded,podsjetio
-DocType: Homepage Section,Cards,Kartice
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Prikaz sheme računa
 DocType: Chapter Member,Chapter Member,Član poglavlja
 DocType: Material Request Plan Item,Minimum Order Quantity,minimalna količina narudžbe
@@ -4989,7 +4978,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Budući datumi nisu dopušteni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Očekivani datum isporuke trebao bi biti nakon datuma prodaje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Poredaj Razina
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontni predložak
+DocType: Company,Chart Of Accounts Template,Kontni predložak
 DocType: Attendance,Attendance Date,Gledatelja Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Ažuriranje zaliha mora biti omogućeno za fakturu kupnje {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Artikl Cijena ažuriran za {0} u Cjeniku {1}
@@ -5554,8 +5543,6 @@ DocType: Installation Note,Installation Date,Instalacija Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Dijelite knjigu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Izrađena je prodajna faktura {0}
 DocType: Employee,Confirmation Date,potvrda Datum
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Inpatient Occupancy,Check Out,Provjeri
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Minimalna količina ne može biti veća od maksimalne količine
@@ -5762,7 +5749,6 @@ DocType: Employee,Prefered Contact Email,Poželjni Kontakt E-mail
 DocType: Cheque Print Template,Cheque Width,Ček Širina
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Provjera valjanosti prodajna cijena za točku protiv Cijena za plaćanje ili procijenjena stopa
 DocType: Fee Schedule,Fee Schedule,Naknada Raspored
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Oznake stupaca:
 DocType: Bank Transaction,Settled,Obavljene
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Uspjeh
 DocType: Quality Feedback,Parameters,parametri
@@ -6436,6 +6422,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,O
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serijski #
 DocType: Material Request Plan Item,Required Quantity,Potrebna količina
+DocType: Cash Flow Mapping Template,Template Name,Naziv predloška
 DocType: Lab Test Template,Lab Test Template,Predložak testa laboratorija
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodstveno razdoblje se preklapa s {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Račun prodaje
@@ -6496,7 +6483,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kao i na datum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kao i na datum
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Datum registracije
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS obavijesti
@@ -6562,7 +6549,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,Kviz
 DocType: Subscription,Trial Period End Date,Datum završetka probnog razdoblja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Niste ovlašteni od {0} prijeđenog limita
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Počnite unositi podatke odavde:
 DocType: Serial No,Asset Status,Status aktive
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Preko dimenzionalnog tereta (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Tablica restorana
@@ -6789,7 +6775,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Poša
 DocType: Contract,Party User,Korisnik stranke
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Sredstva nisu stvorena za <b>{0}</b> . Morat ćete stvoriti imovinu ručno.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Postavite prazan filtar Tvrtke ako je Skupna pošta &quot;Tvrtka&quot;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Knjiženja Datum ne može biti datum u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
 DocType: Loan Repayment,Interest Payable,Kamata se plaća
@@ -7024,7 +7009,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Prosječna stopa
 DocType: Appointment,Appointment With,Sastanak s
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupni iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi prisustvo kao <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Stavka opskrbljena kupcem&quot; ne može imati stopu vrednovanja
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Banka Izjava stanje po glavnom knjigom
@@ -7715,7 +7699,6 @@ DocType: Item Customer Detail,Item Customer Detail,Proizvod - detalji kupca
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimalna naknada zaposlenika {0} premašuje {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Ukupno dodijeljeni Listovi su više od dana u razdoblju
 DocType: Linked Soil Analysis,Linked Soil Analysis,Povezana analiza tla
-DocType: Pricing Rule,Percentage,Postotak
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Proizvod {0} mora biti skladišni
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Zadana rad u tijeku Skladište
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Rasporedi za {0} preklapanja, želite li nastaviti nakon preskakanja preklapanih utora?"

erpnext/translations/hu.csv

@@ -168,12 +168,11 @@ DocType: Appointment Booking Slots,Appointment Booking Slots,Kinevezés Foglalá
 DocType: Work Order Operation,Work In Progress,Dolgozunk rajta
 DocType: Leave Control Panel,Branch (optional),Ág (választható)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,"Kérjük, válasszon dátumot"
-DocType: Item Price,Minimum Qty ,Minimális mennyiség
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimális mennyiség
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM rekurzió: {0} nem lehet {1} gyermek
 DocType: Finance Book,Finance Book,Pénzügyi könyv
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Szabadnapok listája
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,A (z) {0} szülőfiók nem létezik
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Felülvizsgálat és cselekvés
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ennek az alkalmazottnak már van naplója ugyanazon időbélyeggel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Könyvelő
@@ -245,7 +244,6 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,Nyug
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Nyereség/Veszteség
 DocType: Crop,Perennial,Állandó
 DocType: Program,Is Published,Megjelent
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Szállítási jegyzetek megjelenítése
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",A túlzott számlázás engedélyezéséhez frissítse a "Fiókbeállítások felett" pontot a "Túlfizetési támogatás" alatt.
 DocType: Patient Appointment,Procedure,Eljárás
 DocType: Accounts Settings,Use Custom Cash Flow Format,Használja az egyéni pénzforgalom formátumot
@@ -979,7 +977,6 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,"Not permitted, con
 DocType: Patient,Risk Factors,Kockázati tényezők
 DocType: Patient,Occupational Hazards and Environmental Factors,Foglalkozási veszélyek és környezeti tényezők
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Munka megrendelésre már létrehozott készletbejegyzések
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Cikkszám> Tételcsoport> Márka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Lásd a korábbi megrendeléseket
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} beszélgetés
 DocType: Vital Signs,Respiratory rate,Légzésszám
@@ -1137,7 +1134,6 @@ apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Hiba történt a frissítési folyamat során
 DocType: Restaurant Reservation,Restaurant Reservation,Éttermi foglalás
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Tételek
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Szállító> Beszállító típusa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Pályázatírás
 DocType: Payment Entry Deduction,Payment Entry Deduction,Fizetés megadásának levonása
 DocType: Service Level Priority,Service Level Priority,Szolgáltatási szintű prioritás
@@ -1436,7 +1432,6 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Cannot deactivate or cance
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,A bejegyzések beírásához válassza a Cég és a rögzítés dátuma lehetőséget
 DocType: Asset,Maintenance,Karbantartás
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Beteg találkozóból beszerzett
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM konverziós tényező ({0} -> {1}) nem található az elemre: {2}
 DocType: Subscriber,Subscriber,Előfizető
 DocType: Item Attribute Value,Item Attribute Value,Tétel Jellemző értéke
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Pénznem árfolyamnak kell lennie a Beszerzésekre vagy a Vásárói rendelésekre.
@@ -1934,7 +1929,6 @@ DocType: Sales Invoice Item,Rate With Margin,Árérték árlépéses árkülöb
 DocType: Purchase Invoice,Is Return (Debit Note),Ez visszatérítés (tartozás jegyzet)
 DocType: Workstation,Wages,Munkabérek
 DocType: Asset Maintenance,Maintenance Manager Name,Karbantartási vezető neve
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,A társasággal szemben már léteznek tranzakciók!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Kérő webhely
 DocType: Agriculture Task,Urgent,Sürgős
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Rekordok beállítása......
@@ -2631,7 +2625,6 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Source warehouse i
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,A(z) {0} sorban szereplő fizetési feltétel valószínűleg másodpéldány.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Mezőgazdaság (béta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Csomagjegy
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Kérjük, állítsa a Naming Series értékét a (z) {0} beállításra a Beállítás> Beállítások> Soros elnevezés menüponttal"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Iroda bérlés
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,SMS átjáró telepítése
 DocType: Disease,Common Name,Gyakori név
@@ -2797,7 +2790,6 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,{0} must app
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Távollét foglalása sikeres erre {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Nincsenek tételek csomagoláshoz
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Jelenleg csak .csv és .xlsx fájlok támogatottak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás> HR beállítások menüpontban"
 DocType: Shipping Rule Condition,From Value,Értéktől
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
 DocType: Loan,Repayment Method,Törlesztési mód
@@ -4046,7 +4038,6 @@ apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set defaul
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Szükség
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ha be van jelölve, elrejti és letiltja a Kerek összesített mezőt a Fizetési utalványokban"
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Ez az eladási megrendelésekben szereplő kézbesítési dátum alapértelmezett eltolása (napokban). A tartalék eltolás 7 nap a megrendelés leadásának napjától.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás> Számozási sorozat segítségével"
 DocType: Rename Tool,File to Rename,Átnevezendő fájl
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Kérjük, válassza ki ANYGJZ erre a tételre ebben a sorban {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Előfizetési frissítések lekérése
@@ -4648,7 +4639,6 @@ DocType: Healthcare Service Unit Type,Item Details,Elem Részletek
 DocType: Cash Flow Mapping,Is Finance Cost,Ez pénzügyi költség
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,A {0} alkalmazott már megjelölt a részvételin
 DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomag azonos típusból (nyomtatáshoz)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás> Oktatási beállítások menüben"
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Állítsa be az alapértelmezett fogyasztót az étterem beállításai között
 ,Salary Register,Bér regisztráció
 DocType: Company,Default warehouse for Sales Return,Alapértelmezett raktár az értékesítés visszatéréséhez
@@ -4919,7 +4909,6 @@ DocType: Item,Inspection Required before Purchase,Vizsgálat szükséges a vás
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Függő Tevékenységek
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Létrehozási teszt létrehozása
 DocType: Patient Appointment,Reminded,Emlékeztette
-DocType: Homepage Section,Cards,kártyák
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Számlák áttekintése
 DocType: Chapter Member,Chapter Member,Fejezet tagja
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimális rendelési mennyiség
@@ -4937,7 +4926,7 @@ apps/erpnext/erpnext/loan_management/doctype/loan_security_price/loan_security_p
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,A jövőbeni dátumok nem megengedettek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Várható szállítási határidőtnek az értékesítési rendelés utáninak kell lennie
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Újra rendelési szint
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Számlatükör sablonok
+DocType: Company,Chart Of Accounts Template,Számlatükör sablonok
 DocType: Attendance,Attendance Date,Részvétel dátuma
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Készlet frissítést engedélyeznie kell a {0} beszerzési számlához
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Tétel ára frissítve: {0} Árlista {1}
@@ -5501,8 +5490,6 @@ DocType: Installation Note,Installation Date,Telepítés dátuma
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Ledger megosztása
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,A {0} kimenő értékesítési számla létrehozva
 DocType: Employee,Confirmation Date,Visszaigazolás dátuma
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Kérjük, törölje a (z) <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat a dokumentum visszavonásához"
 DocType: Inpatient Occupancy,Check Out,Kijelentkezés
 DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,"Min Menny nem lehet nagyobb, mint Max Mennyiség"
@@ -5709,7 +5696,6 @@ DocType: Employee,Prefered Contact Email,Preferált kapcsolattartási e-mail
 DocType: Cheque Print Template,Cheque Width,Csekk szélesség
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Eladási ár érvényesítése a tételre a Beszerzési árra vagy Készletértékre
 DocType: Fee Schedule,Fee Schedule,Díj időzítése
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Oszlopcímkék:
 DocType: Bank Transaction,Settled,telepedett
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,illeték
 DocType: Quality Feedback,Parameters,paraméterek
@@ -6382,6 +6368,7 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,N
 DocType: Salary Component,Formula,Képlet
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Szériasz #
 DocType: Material Request Plan Item,Required Quantity,Szükséges mennyiség
+DocType: Cash Flow Mapping Template,Template Name,Sablon neve
 DocType: Lab Test Template,Lab Test Template,Labor teszt sablon
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},A számviteli időszak átfedésben van a (z) {0} -gal
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Értékesítési számla
@@ -6441,7 +6428,7 @@ DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi a vállalattal kapcsolatos ügylet !
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Mivel a dátum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Mivel a dátum
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Felvétel dátuma
 DocType: Healthcare Settings,Out Patient SMS Alerts,Betegen kívüli SMS figyelmeztetések
@@ -6506,7 +6493,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment
 DocType: Course Content,Quiz,kvíz
 DocType: Subscription,Trial Period End Date,Próba időszak befejezési dátuma
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Nem engedélyezett hiszen {0} meghaladja határértékek
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Itt kezdje meg az adatok bevitelét:
 DocType: Serial No,Asset Status,Vagyontárgy állapota
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Túlméretes szállítmány (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Éttermi asztal
@@ -6732,7 +6718,6 @@ apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Véle
 DocType: Contract,Party User,Ügyfél felhasználó
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,A (z) <b>{0}</b> számára nem létrehozott eszközök. Az eszközt manuálisan kell létrehoznia.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Kérjük, állítsa Vállakozás szűrését üresre, ha a csoportosítás beállítása 'Vállalkozás'"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Könyvelési dátum nem lehet jövőbeni időpontban
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
 DocType: Loan Repayment,Interest Payable,Fizetendő kamat
@@ -6967,7 +6952,6 @@ apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Pe
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Átlagérték
 DocType: Appointment,Appointment With,Kinevezés
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,A kifizetési ütemezés teljes összegének meg kell egyeznie a Teljes / kerekített összeggel
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Jelölje meg a részvételt mint <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Felhasználó által közölt tétel"" nem lehet Készletérték ára"
 DocType: Subscription Plan Detail,Plan,Terv
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankkivonat mérleg a főkönyvi kivonat szerint
@@ -7658,7 +7642,6 @@ DocType: Item Customer Detail,Item Customer Detail,Tétel vevőjének részletei
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},A (z) {0} alkalmazott maximális haszna meghaladja {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Összes lefoglalt távollét több nap mint ami ebben az időszakban elérhető
 DocType: Linked Soil Analysis,Linked Soil Analysis,Kapcsolodó talajelemzés
-DocType: Pricing Rule,Percentage,Százalék
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Tétel: {0} -  Készlet tételnek kell lennie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Alapértelmezett Folyamatban lévő munka raktára
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","A (z) {0} ütemezések átfedik egymást, szeretné folytatni az átfedő rések kihagyása után?"