diff --git a/README.md b/README.md
index ed57a17..80ebdb6 100644
--- a/README.md
+++ b/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. [Inventory](https://erpnext.com/docs/user/manual/en/stock)
-1. [CRM](https://erpnext.com/docs/user/manual/en/CRM)
-1. [Sales](https://erpnext.com/docs/user/manual/en/selling)
-1. [Purchase](https://erpnext.com/docs/user/manual/en/buying)
-1. [HRMS](https://erpnext.com/docs/user/manual/en/human-resources)
-1. [Project Management](https://erpnext.com/docs/user/manual/en/projects)
-1. [Support](https://erpnext.com/docs/user/manual/en/support)
-1. [Asset Management](https://erpnext.com/docs/user/manual/en/asset)
+1. [Accounting](https://erpnext.com/open-source-accounting)
+1. [Inventory](https://erpnext.com/distribution/inventory-management-system)
+1. [CRM](https://erpnext.com/open-source-crm)
+1. [Sales](https://erpnext.com/open-source-sales-purchase)
+1. [Purchase](https://erpnext.com/open-source-sales-purchase)
+1. [HRMS](https://erpnext.com/open-source-hrms)
+1. [Project Management](https://erpnext.com/open-source-projects)
+1. [Support](https://erpnext.com/open-source-help-desk-software)
+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. [Website Management](https://erpnext.com/docs/user/manual/en/website)
+1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software)
+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/)
 
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index f40b957..786b9cf 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '12.2.0'
+__version__ = '12.0.0-dev'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
diff --git a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
index 569767e..c3e2f7d 100644
--- a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
+++ b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
@@ -26,7 +26,7 @@
 		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")
diff --git a/erpnext/accounts/desk_page/accounting/accounting.json b/erpnext/accounts/desk_page/accounting/accounting.json
index 39ce586..7a777f9 100644
--- a/erpnext/accounts/desk_page/accounting/accounting.json
+++ b/erpnext/accounts/desk_page/accounting/accounting.json
@@ -85,10 +85,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Accounting",
- "modified": "2020-03-05 11:27:25.548004",
+ "modified": "2020-03-12 16:30:35.580450",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting",
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 64efc27..af252e6 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/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": [
   {
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index d5a36b8..0a72d4f 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -102,7 +102,7 @@
 			if not frappe.db.get_value("Account",
 				{'account_name': self.account_name, 'company': ancestors[0]}, 'name'):
 				frappe.throw(_("Please add the account to root level Company - %s" % ancestors[0]))
-		else:
+		elif self.parent_account:
 			descendants = get_descendants_of('Company', self.company)
 			if not descendants: return
 			parent_acc_name_map = {}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04_with_account_number.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04_with_account_number.json
index adfa9f8..3fc109b 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04_with_account_number.json
+++ b/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": {
-							"is_group": 1,
-							"account_number": "10000"
-						},
+                        },
+                        "Debitoren": {
+                            "is_group": 1,
+                            "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": {
-						"account_number": "70000",
-						"is_group": 1,
-						"Wareneingangs-­Verrechnungskonto" : {
-							"account_number": "70001",
-							"account_type": "Stock Received But Not Billed"
-						}
-					},
+                    },
+                    "Kreditoren": {
+                        "account_number": "70000",
+                        "is_group": 1,
+                        "Wareneingangs-­Verrechnungskonto" : {
+                            "account_number": "70001",
+                            "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": {
-                    "account_number": "6990",
-                    "account_type": "Cost of Goods Sold"
-                },
-                "Herstellungskosten: Schwund": {
-                    "account_type": "Stock Adjustment"
-                }
+			"Herstellungskosten": {
+				"account_number": "6990",
+				"account_type": "Cost of Goods Sold"
+			},
+			"Herstellungskosten: Schwund": {
+				"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,
-                    "Erh. Skonti": {
-                        "account_number": "5730"
-                    },
-                    "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 7% Vorsteuer": {
-                        "account_number": "5734"
-                    },
-                    "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 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 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 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 Waren als letzter Abnehmer innerh. Dreiecksgesch. 19% Vorst. u. 19% Ust.": {
-                        "account_number": "5793"
-                    }
-                }
+				}
+			},
+			"Erhaltene Skonti (Gruppe)": {
+				"is_group": 1,
+				"Erh. Skonti": {
+					"account_number": "5730"
+				},
+				"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 7% Vorsteuer": {
+					"account_number": "5734"
+				},
+				"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 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 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 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 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,
-			"Erhaltene Boni (Gruppe)": {
-				"is_group": 1,
-				"Erhaltene Boni 7 % Vorsteuer": {
-					"account_number": "5750"
-				},
-				"Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-					"account_number": "5753"
-				},
-				"Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-					"account_number": "5754"
-				},
-				"Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-					"account_number": "5755"
-				},
-				"Erhaltene Boni 19 % Vorsteuer": {
-					"account_number": "5760"
-				},
-				"Erhaltene Boni": {
-					"account_number": "5769"
-				}
-			},
-			"Erhaltene Rabatte (Gruppe)": {
-				"is_group": 1,
-				"Erhaltene Rabatte": {
-					"account_number": "5770"
-				},
-				"Erhaltene Rabatte 7 % Vorsteuer": {
-					"account_number": "5780"
-				},
-				"Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-					"account_number": "5783"
-				},
-				"Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-					"account_number": "5784"
-				},
-				"Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-					"account_number": "5785"
-				},
-				"Erhaltene Rabatte 19 % Vorsteuer": {
-					"account_number": "5790"
-				}
-			},
+            "is_group": 1,
+            "Erhaltene Boni (Gruppe)": {
+                "is_group": 1,
+                "Erhaltene Boni 7 % Vorsteuer": {
+                    "account_number": "5750"
+                },
+                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                    "account_number": "5753"
+                },
+                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                    "account_number": "5754"
+                },
+                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                    "account_number": "5755"
+                },
+                "Erhaltene Boni 19 % Vorsteuer": {
+                    "account_number": "5760"
+                },
+                "Erhaltene Boni": {
+                    "account_number": "5769"
+                }
+            },
+            "Erhaltene Rabatte (Gruppe)": {
+                "is_group": 1,
+                "Erhaltene Rabatte": {
+                    "account_number": "5770"
+                },
+                "Erhaltene Rabatte 7 % Vorsteuer": {
+                    "account_number": "5780"
+                },
+                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                    "account_number": "5783"
+                },
+                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                    "account_number": "5784"
+                },
+                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                    "account_number": "5785"
+                },
+                "Erhaltene Rabatte 19 % Vorsteuer": {
+                    "account_number": "5790"
+                }
+            },
             "Andere aktivierte Eigenleistungen": {
                 "account_number": "4820"
             },
@@ -2407,29 +2433,26 @@
             "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchgewinn)": {
                 "account_number": "4849"
             },
-            "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchgewinn) (Gruppe)": {
-                "is_group": 1,
-                "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchgewinn)": {
-                    "account_number": "4850"
-                },
-                "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {
-                    "account_number": "4851"
-                },
-                "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (inl\u00e4ndische Kap.Ges., bei Buchgewinn)": {
-                    "account_number": "4852"
-                },
-                "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchvergewinn)": {
-                    "account_number": "4855"
-                },
-                "Anlagenabg\u00e4nge immaterielle VG (Restbuchwert bei Buchgewinn)": {
-                    "account_number": "4856"
-                },
-                "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchgewinn)": {
-                    "account_number": "4857"
-                },
-                "Anlagenabg\u00e4nge Finanzanlagen (inl\u00e4ndische Kap.Ges., Restbuchwert bei Buchgewinn)": {
-                    "account_number": "4858"
-                }
+            "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchgewinn)": {
+                "account_number": "4850"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {
+                "account_number": "4851"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (inl\u00e4ndische Kap.Ges., bei Buchgewinn)": {
+                "account_number": "4852"
+            },
+            "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchvergewinn)": {
+                "account_number": "4855"
+            },
+            "Anlagenabg\u00e4nge immaterielle VG (Restbuchwert bei Buchgewinn)": {
+                "account_number": "4856"
+            },
+            "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchgewinn)": {
+                "account_number": "4857"
+            },
+            "Anlagenabg\u00e4nge Finanzanlagen (inl\u00e4ndische Kap.Ges., Restbuchwert bei Buchgewinn)": {
+                "account_number": "4858"
             },
             "Ertr\u00e4ge aus Zuschreibungen des Sachanlageverm\u00f6gens": {
                 "account_number": "4910",
@@ -2552,20 +2575,17 @@
             "Entnahme von Gegenst\u00e4nden ohne USt": {
                 "account_number": "4605"
             },
-            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 7 % USt (Gruppe)": {
-                "is_group": 1,
-                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 7 % USt": {
-                    "account_number": "4630"
-                },
-                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt": {
-                    "account_number": "4637"
-                },
-                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternnehmens ohne USt (Telefon-Nutzung)": {
-                    "account_number": "4638"
-                },
-                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt (Kfz-Nutzung)": {
-                    "account_number": "4639"
-                }
+            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 7 % USt": {
+                "account_number": "4630"
+            },
+            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt": {
+                "account_number": "4637"
+            },
+            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternnehmens ohne USt (Telefon-Nutzung)": {
+                "account_number": "4638"
+            },
+            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt (Kfz-Nutzung)": {
+                "account_number": "4639"
             },
             "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 19 % USt (Gruppe)": {
                 "is_group": 1,
@@ -2603,14 +2623,11 @@
             "Unentgeltliche Zuwendung von Gegenst\u00e4nden ohne USt": {
                 "account_number": "4689"
             },
-            "Nicht steuerbare Ums\u00e4tze (Innenums\u00e4tze) (Gruppe)": {
-                "is_group": 1,
-                "Nicht steuerbare Ums\u00e4tze (Innenums\u00e4tze)": {
-                    "account_number": "4690"
-                },
-                "Umsatzsteuerverg\u00fctungen, z.B. nach \u00a7 24 UStG": {
-                    "account_number": "4695"
-                }
+            "Nicht steuerbare Ums\u00e4tze (Innenums\u00e4tze)": {
+                "account_number": "4690"
+            },
+            "Umsatzsteuerverg\u00fctungen, z.B. nach \u00a7 24 UStG": {
+                "account_number": "4695"
             },
             "Au\u00dferordentliche Ertr\u00e4ge (Gruppe)": {
                 "is_group": 1,
@@ -2620,48 +2637,42 @@
                 "Au\u00dferordentliche Ertr\u00e4ge finanzwirksam": {
                     "account_number": "7401"
                 },
-                "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam (Gruppe)": {
-                    "is_group": 1,
-                    "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam": {
-                        "account_number": "7450"
-                    },
-                    "Ertr\u00e4ge durch Verschmelzung und Umwandlung": {
-                        "account_number": "7451"
-                    },
-                    "Ertr\u00e4ge durch den Verkauf von bedeutenden Beteiligungen": {
-                        "account_number": "7452"
-                    },
-                    "Ert\u00e4ge durch den Verkauf von bedeutenden Grundst\u00fccken": {
-                        "account_number": "7453"
-                    },
-                    "Gewinn aus der Ver\u00e4u\u00dferung oder der Aufgabe von Gesch\u00e4ftsaktivit\u00e4ten nach Steuern": {
-                        "account_number": "7454"
-                    }
+                "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam": {
+                    "account_number": "7450"
                 },
-                "Au\u00dferordentliche Ertr\u00e4ge aus der Anwendung von \u00dcbergangsvorschriften (Gruppe)": {
-                    "is_group": 1,
-                    "Au\u00dferordentliche Ertr\u00e4ge aus der Anwendung von \u00dcbergangsvorschriften": {
-                        "account_number": "7460"
-                    },
-                    "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Sachanlageverm\u00f6gen": {
-                        "account_number": "7461"
-                    },
-                    "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Finanzanlageverm\u00f6gen": {
-                        "account_number": "7462"
-                    },
-                    "Au\u00dferordentliche Ertr\u00e4ge: Wertpapiere im Umlaufverm\u00f6gen": {
-                        "account_number": "7463"
-                    },
-                    "Au\u00dferordentliche Ertr\u00e4ge: latente Steuern": {
-                        "account_number": "7464"
-                    }
+                "Ertr\u00e4ge durch Verschmelzung und Umwandlung": {
+                    "account_number": "7451"
+                },
+                "Ertr\u00e4ge durch den Verkauf von bedeutenden Beteiligungen": {
+                    "account_number": "7452"
+                },
+                "Ert\u00e4ge durch den Verkauf von bedeutenden Grundst\u00fccken": {
+                    "account_number": "7453"
+                },
+                "Gewinn aus der Ver\u00e4u\u00dferung oder der Aufgabe von Gesch\u00e4ftsaktivit\u00e4ten nach Steuern": {
+                    "account_number": "7454"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge aus der Anwendung von \u00dcbergangsvorschriften": {
+                    "account_number": "7460"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Sachanlageverm\u00f6gen": {
+                    "account_number": "7461"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Finanzanlageverm\u00f6gen": {
+                    "account_number": "7462"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge: Wertpapiere im Umlaufverm\u00f6gen": {
+                    "account_number": "7463"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge: latente Steuern": {
+                    "account_number": "7464"
                 }
             }
         },
         "7 - sonstige betriebliche Aufwendungen": {
             "root_type": "Expense",
-			"is_group": 1,
-			"Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
+            "is_group": 1,
+            "Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
                 "is_group": 1,
                 "Erl\u00f6sschm\u00e4lerungen": {
                     "account_number": "4700"
@@ -2692,40 +2703,43 @@
                 },
                 "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 16 % USt": {
                     "account_number": "4729"
+                }
+            },
+            "Gew\u00e4hrte Skonti (Gruppe)": {
+                "is_group": 1,
+                "Gew. Skonti": {
+                    "account_number": "4730"
                 },
-                "Gew\u00e4hrte Skonti (Gruppe)": {
-                    "is_group": 1,
-                    "Gew. Skonti": {
-                        "account_number": "4730"
-                    },
-                    "Gew. Skonti 7 % USt": {
-                        "account_number": "4731"
-                    },
-                    "Gew. Skonti 19 % USt": {
-                        "account_number": "4736"
-                    },
-                    "Gew. Skonti aus Lieferungen von Mobilfunkger./Schaltkr., f. die der Leistungsempf. die Ust. schuldet": {
-                        "account_number": "4738"
-                    },
-                    "Gew. Skonti aus Leistungen, f. die der Leistungsempf. die Umsatzsteuer nach \u00a7 13b UStG schuldet": {
-                        "account_number": "4741"
-                    },
-                    "Gew. Skonti aus Erl\u00f6sen aus im anderen EU-Land steuerpfl. Leistungen, f. die der Leistungsempf. die Ust. schuldet": {
-                        "account_number": "4742"
-                    },
-                    "Gew. Skonti aus steuerfreien innergem. Lieferungen \u00a7 4 Nr. 1b UStG": {
-                        "account_number": "4743"
-                    },
-                    "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen": {
-                        "account_number": "4745"
-                    },
-                    "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 7% USt": {
-                        "account_number": "4746"
-                    },
-                    "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 19% USt": {
-                        "account_number": "4748"
-                    }
+                "Gew. Skonti 7 % USt": {
+                    "account_number": "4731"
                 },
+                "Gew. Skonti 19 % USt": {
+                    "account_number": "4736"
+                },
+                "Gew. Skonti aus Lieferungen von Mobilfunkger./Schaltkr., f. die der Leistungsempf. die Ust. schuldet": {
+                    "account_number": "4738"
+                },
+                "Gew. Skonti aus Leistungen, f. die der Leistungsempf. die Umsatzsteuer nach \u00a7 13b UStG schuldet": {
+                    "account_number": "4741"
+                },
+                "Gew. Skonti aus Erl\u00f6sen aus im anderen EU-Land steuerpfl. Leistungen, f. die der Leistungsempf. die Ust. schuldet": {
+                    "account_number": "4742"
+                },
+                "Gew. Skonti aus steuerfreien innergem. Lieferungen \u00a7 4 Nr. 1b UStG": {
+                    "account_number": "4743"
+                },
+                "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen": {
+                    "account_number": "4745"
+                },
+                "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 7% USt": {
+                    "account_number": "4746"
+                },
+                "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 19% USt": {
+                    "account_number": "4748"
+                }
+            },
+            "Gew\u00e4hrte Boni (Gruppe)": {
+                "is_group": 1,
                 "Gew\u00e4hrte Boni 7 % USt": {
                     "account_number": "4750"
                 },
@@ -2744,7 +2758,7 @@
                 "Gew\u00e4hrte Rabatte 19 % USt": {
                     "account_number": "4790"
                 }
-			},
+            },
             "Sonstige betriebliche Aufwendungen": {
                 "account_number": "6300"
             },
@@ -2838,103 +2852,79 @@
                     "account_number": "6398"
                 }
             },
-            "Versicherungen (Gruppe)": {
-                "is_group": 1,
-                "Versicherungen": {
-                    "account_number": "6400"
-                },
-                "Versicherungen f. Geb\u00e4ude, die zum Betriebsverm\u00f6gen geh\u00f6ren": {
-                    "account_number": "6405"
-                },
-                "Netto-Pr\u00e4mie f. R\u00fcckdeckung k\u00fcnftiger Versorgungsleistungen": {
-                    "account_number": "6410"
-                },
-                "Beitr\u00e4ge": {
-                    "account_number": "6420"
-                },
-                "Sonstige Abgaben": {
-                    "account_number": "6430"
-                },
-                "Steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
-                    "account_number": "6436"
-                },
-                "Steuerlich nicht abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
-                    "account_number": "6437"
-                },
-                "Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes": {
-                    "account_number": "6440"
-                },
-                "Reparaturen und Instandhaltung von Bauten": {
-                    "account_number": "6450"
-                },
-                "Reparaturen und Instandhaltung von technischenAnlagen und Maschinen": {
-                    "account_number": "6460"
-                },
-                "Reparaturen und Instandhaltung von anderen Anlagen und Betriebs- und Gesch\u00e4ftsausstattung": {
-                    "account_number": "6470"
-                },
-                "Zuf\u00fchrung zu Aufwandsr\u00fcckstellungen": {
-                    "account_number": "6475"
-                },
-                "Reparaturen und Instandhaltung von anderen Anlagen": {
-                    "account_number": "6485"
-                },
-                "Sonstige Reparaturen und Instandhaltungen": {
-                    "account_number": "6490"
-                },
-                "Wartungskosten f. Hard- und Software": {
-                    "account_number": "6495"
-                },
-                "Mietleasing (bewegliche Wirtschaftsg\u00fcter)": {
-                    "account_number": "6498"
-                }
+            "Versicherungen": {
+                "account_number": "6400"
+            },
+            "Versicherungen f. Geb\u00e4ude, die zum Betriebsverm\u00f6gen geh\u00f6ren": {
+                "account_number": "6405"
+            },
+            "Netto-Pr\u00e4mie f. R\u00fcckdeckung k\u00fcnftiger Versorgungsleistungen": {
+                "account_number": "6410"
+            },
+            "Beitr\u00e4ge": {
+                "account_number": "6420"
+            },
+            "Sonstige Abgaben": {
+                "account_number": "6430"
+            },
+            "Steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
+                "account_number": "6436"
+            },
+            "Steuerlich nicht abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
+                "account_number": "6437"
+            },
+            "Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes": {
+                "account_number": "6440"
+            },
+            "Reparaturen und Instandhaltung von Bauten": {
+                "account_number": "6450"
+            },
+            "Reparaturen und Instandhaltung von technischenAnlagen und Maschinen": {
+                "account_number": "6460"
+            },
+            "Reparaturen und Instandhaltung von anderen Anlagen und Betriebs- und Gesch\u00e4ftsausstattung": {
+                "account_number": "6470"
+            },
+            "Zuf\u00fchrung zu Aufwandsr\u00fcckstellungen": {
+                "account_number": "6475"
+            },
+            "Reparaturen und Instandhaltung von anderen Anlagen": {
+                "account_number": "6485"
+            },
+            "Sonstige Reparaturen und Instandhaltungen": {
+                "account_number": "6490"
+            },
+            "Wartungskosten f. Hard- und Software": {
+                "account_number": "6495"
+            },
+            "Mietleasing (bewegliche Wirtschaftsg\u00fcter)": {
+                "account_number": "6498"
             },
             "Fahrzeugkosten (Gruppe)": {
                 "is_group": 1,
                 "Fahrzeugkosten": {
                     "account_number": "6500"
                 },
-                "Kfz-Versicherungen (Gruppe)": {
-                    "is_group": 1,
-                    "Kfz-Versicherungen": {
-                        "account_number": "6520"
-                    }
+                "Kfz-Versicherungen": {
+                    "account_number": "6520"
                 },
-                "Laufende Kfz-Betriebskosten (Gruppe)": {
-                    "is_group": 1,
-                    "Laufende Kfz-Betriebskosten": {
-                        "account_number": "6530"
-                    }
+                "Laufende Kfz-Betriebskosten": {
+                    "account_number": "6530"
                 },
-                "Kfz-Reparaturen (Gruppe)": {
-                    "is_group": 1,
-                    "Kfz-Reparaturen": {
-                        "account_number": "6540"
-                    }
+                "Kfz-Reparaturen": {
+                    "account_number": "6540"
                 },
-                "Garagenmiete (Gruppe)": {
-                    "is_group": 1,
-                    "Garagenmiete": {
-                        "account_number": "6550"
-                    }
+                "Garagenmiete": {
+                    "account_number": "6550"
                 },
-                "Mietleasing Kfz (Gruppe)": {
-                    "is_group": 1,
-                    "Mietleasing Kfz": {
-                        "account_number": "6560"
-                    }
+                "Mietleasing Kfz": {
+                    "account_number": "6560"
                 },
-                "Sonstige Kfz-Kosten (Gruppe)": {
-                    "is_group": 1,
-                    "Sonstige Kfz-Kosten": {
-                        "account_number": "6570"
-                    }
+                "Sonstige Kfz-Kosten": {
+                    "account_number": "6570"
                 },
-                "Mautgeb\u00fchren (Gruppe)": {
-                    "is_group": 1,
-                    "Mautgeb\u00fchren": {
-                        "account_number": "6580"
-                    }
+                "Mautgeb\u00fchren": {
+                    "account_number": "6580"
                 },
                 "Kfz-Kosten f. betrieblich genutzte zum Privatverm\u00f6gen geh\u00f6rende Kraftfahrzeuge": {
                     "account_number": "6590"
@@ -2996,20 +2986,23 @@
                 "Nicht abzugsf\u00e4hige Betriebsausgaben aus Werbe- und Repr\u00e4sentationskosten": {
                     "account_number": "6645"
                 },
-                "Reisekosten Arbeitnehmer": {
-                    "account_number": "6650"
-                },
-                "Reisekosten Arbeitnehmer \u00dcbernachtungsaufwand": {
-                    "account_number": "6660"
-                },
-                "Reisekosten Arbeitnehmer Fahrtkosten": {
-                    "account_number": "6663"
-                },
-                "Reisekosten Arbeitnehmer Verpflegungsmehraufwand": {
-                    "account_number": "6664"
-                },
-                "Kilometergelderstattung Arbeitnehmer": {
-                    "account_number": "6668"
+                "Reisekosten Arbeitnehmer (Gruppe)": {
+                    "is_group": 1,
+                    "Reisekosten Arbeitnehmer": {
+                        "account_number": "6650"
+                    },
+                    "Reisekosten Arbeitnehmer \u00dcbernachtungsaufwand": {
+                        "account_number": "6660"
+                    },
+                    "Reisekosten Arbeitnehmer Fahrtkosten": {
+                        "account_number": "6663"
+                    },
+                    "Reisekosten Arbeitnehmer Verpflegungsmehraufwand": {
+                        "account_number": "6664"
+                    },
+                    "Kilometergelderstattung Arbeitnehmer": {
+                        "account_number": "6668"
+                    }
                 },
                 "Reisekosten Unternehmer (Gruppe)": {
                     "is_group": 1,
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
index a36f421..3c12f85 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
@@ -48,12 +48,6 @@
 		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");
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
index cf6dc7a..cf55d55 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
+++ b/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
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
index 522ed4f..462d967 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
@@ -172,7 +172,7 @@
 	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 @@
 
 	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("""
diff --git a/erpnext/accounts/doctype/accounts_settings/regional/united_states.js b/erpnext/accounts/doctype/accounts_settings/regional/united_states.js
new file mode 100644
index 0000000..d47d6e5
--- /dev/null
+++ b/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");
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank/bank.js b/erpnext/accounts/doctype/bank/bank.js
index 463d29c..de9498e 100644
--- a/erpnext/accounts/doctype/bank/bank.js
+++ b/erpnext/accounts/doctype/bank/bank.js
@@ -7,7 +7,20 @@
 	},
 	refresh: function(frm) {
 		add_fields_to_mapping_table(frm);
-	}
+
+		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank' };
+
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if (frm.doc.__islocal) {
+			frm.set_df_property('address_and_contact', 'hidden', 1);
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+		else {
+			frm.set_df_property('address_and_contact', 'hidden', 0);
+			frappe.contacts.render_address_and_contact(frm);
+		}
+	},
 });
 
 
diff --git a/erpnext/accounts/doctype/bank/bank.json b/erpnext/accounts/doctype/bank/bank.json
index 4fa0e4f..99978e6 100644
--- a/erpnext/accounts/doctype/bank/bank.json
+++ b/erpnext/accounts/doctype/bank/bank.json
@@ -1,224 +1,137 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:bank_name", 
- "beta": 0, 
- "creation": "2018-04-07 16:59:59.496668", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:bank_name",
+ "creation": "2018-04-07 16:59:59.496668",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "bank_details_section",
+  "bank_name",
+  "swift_number",
+  "column_break_1",
+  "branch_code",
+  "website",
+  "address_and_contact",
+  "address_html",
+  "column_break_13",
+  "contact_html",
+  "data_import_configuration_section",
+  "bank_transaction_mapping",
+  "section_break_4",
+  "plaid_access_token"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Bank 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, 
-   "translatable": 0, 
+   "fieldname": "bank_name",
+   "fieldtype": "Data",
+   "label": "Bank Name",
+   "reqd": 1,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "data_import_configuration_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Data Import Configuration", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank_details_section",
+   "fieldtype": "Section Break",
+   "label": "Bank Details"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_transaction_mapping", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Transaction Mapping", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Bank Transaction Mapping", 
-   "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_in_quick_entry": 1,
+   "fieldname": "swift_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "SWIFT number",
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_1",
+   "fieldtype": "Column Break",
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "plaid_access_token", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Plaid Access Token", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "allow_in_quick_entry": 1,
+   "fieldname": "branch_code",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Branch Code",
+   "unique": 1
+  },
+  {
+   "fieldname": "address_and_contact",
+   "fieldtype": "Section Break",
+   "label": "Address and Contact",
+   "options": "fa fa-map-marker"
+  },
+  {
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "label": "Address HTML"
+  },
+  {
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website"
+  },
+  {
+   "fieldname": "column_break_13",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "contact_html",
+   "fieldtype": "HTML",
+   "label": "Contact HTML"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "data_import_configuration_section",
+   "fieldtype": "Section Break",
+   "label": "Data Import Configuration"
+  },
+  {
+   "fieldname": "bank_transaction_mapping",
+   "fieldtype": "Table",
+   "label": "Bank Transaction Mapping",
+   "options": "Bank Transaction Mapping"
+  },
+  {
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "plaid_access_token",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Plaid Access Token",
+   "no_copy": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-11-27 16:12:13.938776", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Bank", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2020-03-25 21:22:33.496264",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank/bank.py b/erpnext/accounts/doctype/bank/bank.py
index b205d56..41aae14 100644
--- a/erpnext/accounts/doctype/bank/bank.py
+++ b/erpnext/accounts/doctype/bank/bank.py
@@ -5,6 +5,12 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 
 class Bank(Document):
-	pass
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
+
+	def on_trash(self):
+		delete_contact_and_address('Bank', self.name)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.json b/erpnext/accounts/doctype/bank_account/bank_account.json
index c8ae26d..aa9c434 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.json
+++ b/erpnext/accounts/doctype/bank_account/bank_account.json
@@ -24,8 +24,6 @@
   "iban",
   "column_break_12",
   "bank_account_no",
-  "branch_code",
-  "swift_number",
   "address_and_contact",
   "address_html",
   "website",
@@ -146,17 +144,6 @@
    "length": 30
   },
   {
-   "fieldname": "branch_code",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Branch Code"
-  },
-  {
-   "fieldname": "swift_number",
-   "fieldtype": "Data",
-   "label": "SWIFT number"
-  },
-  {
    "fieldname": "address_and_contact",
    "fieldtype": "Section Break",
    "label": "Address and Contact",
@@ -213,7 +200,7 @@
   }
  ],
  "links": [],
- "modified": "2020-01-29 20:42:26.458316",
+ "modified": "2020-01-30 20:42:26.458316",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
index 0acbe20..065d25e 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
@@ -4,8 +4,8 @@
 cur_frm.add_fetch('bank_account','account','account');
 cur_frm.add_fetch('bank_account','bank_account_no','bank_account_no');
 cur_frm.add_fetch('bank_account','iban','iban');
-cur_frm.add_fetch('bank_account','branch_code','branch_code');
-cur_frm.add_fetch('bank_account','swift_number','swift_number');
+cur_frm.add_fetch('bank','branch_code','branch_code');
+cur_frm.add_fetch('bank','swift_number','swift_number');
 
 frappe.ui.form.on('Bank Guarantee', {
 	setup: function(frm) {
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
index 9aa2ee2..f28a074 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
@@ -6,6 +6,7 @@
 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 @@
 
 @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]
diff --git a/erpnext/accounts/doctype/c_form/c_form.js b/erpnext/accounts/doctype/c_form/c_form.js
index 3d0fc0a..846408f 100644
--- a/erpnext/accounts/doctype/c_form/c_form.js
+++ b/erpnext/accounts/doctype/c_form/c_form.js
@@ -32,10 +32,12 @@
 	invoice_no(frm, cdt, cdn) {
 		let d = frappe.get_doc(cdt, cdn);
 
-		frm.call('get_invoice_details', {
-			invoice_no: d.invoice_no
-		}).then(r => {
-			frappe.model.set_value(cdt, cdn, r.message);
-		});
+		if (d.invoice_no) {
+			frm.call('get_invoice_details', {
+				invoice_no: d.invoice_no
+			}).then(r => {
+				frappe.model.set_value(cdt, cdn, r.message);
+			});
+		}
 	}
 });
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 976f05a..99b89d1 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/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": [
   {
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index e64bc9e..2214811 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -114,13 +114,13 @@
    "fieldname": "debit_in_account_currency",
    "fieldtype": "Currency",
    "label": "Debit Amount in Account Currency",
-   "options": "currency"
+   "options": "account_currency"
   },
   {
    "fieldname": "credit_in_account_currency",
    "fieldtype": "Currency",
    "label": "Credit Amount in Account Currency",
-   "options": "currency"
+   "options": "account_currency"
   },
   {
    "fieldname": "against",
@@ -250,7 +250,7 @@
  "icon": "fa fa-list",
  "idx": 1,
  "in_create": 1,
- "modified": "2020-02-10 04:54:57.777905",
+ "modified": "2020-03-28 16:22:33.766994",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index f9e4fd7..14d0531 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -233,35 +233,14 @@
 			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")
-	data = list(data)
-	data.append(precision)
-	status = get_status(data)
-	frappe.db.set_value(against_voucher_type, against_voucher, {
-		'outstanding_amount': bal,
-		'status': status
-	})
+		# Didn't use db_set for optimisation purpose
+		ref_doc.outstanding_amount = bal
+		frappe.db.set_value(against_voucher_type, against_voucher, 'outstanding_amount', bal)
+
+		ref_doc.set_status(update=True)
+
 
 def validate_frozen_account(account, adv_adj=None):
 	frozen_account = frappe.db.get_value("Account", account, "freeze_account")
diff --git a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
index 01ddd29..b4a547b 100644
--- a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
@@ -38,6 +38,7 @@
 			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]
 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 2cbd40b..eb3017a 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -454,8 +454,10 @@
 	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 @@
 				bank_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
 				bank_account_currency = d.account_currency
 
-		if pay_to_recd_from:
-			self.pay_to_recd_from = frappe.db.get_value(d.party_type, pay_to_recd_from,
-				"customer_name" if d.party_type=="Customer" else "supplier_name")
+		if party_type and pay_to_recd_from:
+			self.pay_to_recd_from = frappe.db.get_value(party_type, pay_to_recd_from,
+				"customer_name" if party_type=="Customer" else "supplier_name")
 			if bank_amount:
 				total_amount = bank_amount
 				currency = bank_account_currency
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 968fb60..d208087 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -33,7 +33,9 @@
 		frm.set_query("party_bank_account", function() {
 			return {
 				filters: {
-					"is_company_account":0
+					"is_company_account":0,
+					party_type: frm.doc.party_type,
+					party: frm.doc.party
 				}
 			}
 		});
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 5303743..a25e0e3 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -161,15 +161,15 @@
 		pe.insert()
 		pe.submit()
 
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-		self.assertEqual(si.status, 'Paid')
+		outstanding_amount, status = frappe.db.get_value("Sales Invoice", si.name, ["outstanding_amount", "status"])
+		self.assertEqual(flt(outstanding_amount), 0)
+		self.assertEqual(status, 'Paid')
 
 		pe.cancel()
 
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 100)
-		self.assertEqual(si.status, 'Unpaid')
+		outstanding_amount, status = frappe.db.get_value("Sales Invoice", si.name, ["outstanding_amount", "status"])
+		self.assertEqual(flt(outstanding_amount), 100)
+		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 @@
 		pe.insert()
 		pe.submit()
 
-		outstanding_amount = flt(frappe.db.get_value("Purchase Invoice", pi.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-		self.assertEqual(pi.status, 'Paid')
+		outstanding_amount, status = frappe.db.get_value("Purchase Invoice", pi.name, ["outstanding_amount", "status"])
+		self.assertEqual(flt(outstanding_amount), 0)
+		self.assertEqual(status, 'Paid')
 
 		pe.cancel()
 
-		outstanding_amount = flt(frappe.db.get_value("Purchase Invoice", pi.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 100)
-		self.assertEqual(pi.status, 'Unpaid')
+		outstanding_amount, status = frappe.db.get_value("Purchase Invoice", pi.name, ["outstanding_amount", "status"])
+		self.assertEqual(flt(outstanding_amount), 250)
+		self.assertEqual(status, 'Unpaid')
 
 	def test_payment_entry_against_ec(self):
 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index bff995e..c1559a7 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -839,7 +839,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "bank_account.branch_code", 
+   "fetch_from": "bank.branch_code", 
    "fieldname": "branch_code", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -873,7 +873,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "bank_account.swift_number", 
+   "fetch_from": "bank.swift_number", 
    "fieldname": "swift_number", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 0fade8c..7e9211a 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -317,13 +317,13 @@
 			"payment_request_type": args.get("payment_request_type"),
 			"currency": ref_doc.currency,
 			"grand_total": grand_total,
-			"email_to": args.recipient_id or "",
+			"email_to": args.recipient_id or ref_doc.owner,
 			"subject": _("Payment Request for {0}").format(args.dn),
 			"message": gateway_account.get("message") or get_dummy_message(ref_doc),
 			"reference_doctype": args.dt,
 			"reference_name": args.dn,
-			"party_type": args.get("party_type"),
-			"party": args.get("party"),
+			"party_type": args.get("party_type") or "Customer",
+			"party": args.get("party") or ref_doc.customer,
 			"bank_account": bank_account
 		})
 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index cc992ce..87d40fc 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -125,27 +125,6 @@
 			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 @@
 		# 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 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"])
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 4a7322d..ef90b94 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/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",
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index c0e1285..c49ac29 100755
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -423,7 +423,10 @@
 				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,
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 7f7938d..ba1ceff 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -1223,18 +1223,38 @@
 				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")
-			args = [
-				self.name,
-				self.outstanding_amount,
-				self.is_discounted,
-				self.is_return,
-				self.due_date,
-				self.docstatus,
-				precision,
-			]
-			self.status = get_status(args)
+			if self.docstatus == 2:
+				status = "Cancelled"
+			elif self.docstatus == 1:
+				if outstanding_amount > 0 and due_date < nowdate and self.is_discounted and discountng_status=='Disbursed':
+					self.status = "Overdue and Discounted"
+				elif outstanding_amount > 0 and due_date < nowdate:
+					self.status = "Overdue"
+				elif outstanding_amount > 0 and due_date >= nowdate and self.is_discounted and discountng_status=='Disbursed':
+					self.status = "Unpaid and Discounted"
+				elif outstanding_amount > 0 and due_date >= nowdate:
+					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 @@
 
 	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
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index e48e6c9..3d5ce8a 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -786,7 +786,7 @@
 	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 @@
 			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 @@
 		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 @@
 							{'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 @@
 		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})
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 6d53530..5ba455c 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -136,12 +136,11 @@
 
 
 def make_entry(args, adv_adj, update_outstanding, from_repost=False):
-	args.update({"doctype": "GL Entry"})
-	gle = frappe.get_doc(args)
+	gle = frappe.new_doc("GL Entry")
+	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
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index e9c652e..98b6d79 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -284,8 +284,8 @@
 	existing_gle_currency = get_party_gle_currency(party_type, party, company)
 
 	if existing_gle_currency and party_account_currency != existing_gle_currency:
-		frappe.throw(_("Accounting Entry for {0}: {1} can only be made in currency: {2}")
-			.format(party_type, party, existing_gle_currency), InvalidAccountCurrency)
+		frappe.throw(_("{0} {1} has accounting entries in currency {2} for company {3}. Please select a receivable or payable account with currency {2}.")
+			.format(frappe.bold(party_type), frappe.bold(party), frappe.bold(existing_gle_currency), frappe.bold(company)), InvalidAccountCurrency)
 
 def validate_party_accounts(doc):
 	companies = []
@@ -298,15 +298,13 @@
 			companies.append(account.company)
 
 		party_account_currency = frappe.db.get_value("Account", account.account, "account_currency", cache=True)
-		existing_gle_currency = get_party_gle_currency(doc.doctype, doc.name, account.company)
 		if frappe.db.get_default("Company"):
 			company_default_currency = frappe.get_cached_value('Company',
 				frappe.db.get_default("Company"),  "default_currency")
 		else:
 			company_default_currency = frappe.db.get_value('Company', account.company, "default_currency")
 
-		if existing_gle_currency and party_account_currency != existing_gle_currency:
-			frappe.throw(_("Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.").format(existing_gle_currency, account.company))
+		validate_party_gle_currency(doc.doctype, doc.name, account.company, party_account_currency)
 
 		if doc.get("default_currency") and party_account_currency and company_default_currency:
 			if doc.default_currency != party_account_currency and doc.default_currency != company_default_currency:
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index 791f3f8..bb0d0a1 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -218,15 +218,15 @@
 						<td></td>
 						<td style="text-align: right"><b>{%= __("Total") %}</b></td>
 						<td style="text-align: right">
-							{%= format_currency(data[i]["invoiced"], data[i]["currency"] ) %}</td>
+							{%= format_currency(data[i]["invoiced"], data[0]["currency"] ) %}</td>
 
 						{% if(!filters.show_future_payments) { %}
 							<td style="text-align: right">
-								{%= format_currency(data[i]["paid"], data[i]["currency"]) %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %} </td>
+								{%= format_currency(data[i]["paid"], data[0]["currency"]) %}</td>
+							<td style="text-align: right">{%= format_currency(data[i]["credit_note"], data[0]["currency"]) %} </td>
 						{% } %}
 						<td style="text-align: right">
-							{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
+							{%= format_currency(data[i]["outstanding"], data[0]["currency"]) %}</td>
 
 						{% if(filters.show_future_payments) { %}
 							{% if(report.report_name === "Accounts Receivable") { %}
@@ -234,8 +234,8 @@
 									{%= data[i]["po_no"] %}</td>
 							{% } %}
 							<td style="text-align: right">{%= data[i]["future_ref"] %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %}</td>
+							<td style="text-align: right">{%= format_currency(data[i]["future_amount"], data[0]["currency"]) %}</td>
+							<td style="text-align: right">{%= format_currency(data[i]["remaining_balance"], data[0]["currency"]) %}</td>
 						{% } %}
 					{% } %}
 				{% } else { %}
@@ -256,10 +256,10 @@
 						{% } else { %}
 							<td><b>{%= __("Total") %}</b></td>
 						{% } %}
-						<td style="text-align: right">{%= format_currency(data[i]["invoiced"], data[i]["currency"]) %}</td>
-						<td style="text-align: right">{%= format_currency(data[i]["paid"], data[i]["currency"]) %}</td>
-						<td style="text-align: right">{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %}</td>
-						<td style="text-align: right">{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
+						<td style="text-align: right">{%= format_currency(data[i]["invoiced"], data[0]["currency"]) %}</td>
+						<td style="text-align: right">{%= format_currency(data[i]["paid"], data[0]["currency"]) %}</td>
+						<td style="text-align: right">{%= format_currency(data[i]["credit_note"], data[0]["currency"]) %}</td>
+						<td style="text-align: right">{%= format_currency(data[i]["outstanding"], data[0]["currency"]) %}</td>
 					{% } %}
 				{% } %}
 				</tr>
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 0438f6d..240b0d8 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -7,7 +7,7 @@
 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 @@
 			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 @@
 					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):
-					conditions.append("{0} = %s".format(dimension))
-					values.append(self.filters.get(dimension))
+				if self.filters.get(dimension.fieldname):
+					if frappe.get_cached_value('DocType', dimension.document_type, 'is_tree'):
+						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
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 35915d0..080a7c9 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -16,7 +16,7 @@
 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 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 @@
 			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):
-				additional_conditions.append("{0} in (%({0})s)".format(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))
+				additional_conditions.append("{0} in %({0})s".format(dimension.fieldname))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index 40469ae..9a2205a 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/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 %}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 8bea365..898ac13 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -10,7 +10,7 @@
 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):
@@ -131,7 +131,7 @@
 	gl_entries = frappe.db.sql(
 		"""
 		select
-			posting_date, account, party_type, party,
+			name as gl_entry, posting_date, account, party_type, party,
 			voucher_type, voucher_no, cost_center, project,
 			against_voucher_type, against_voucher, account_currency,
 			remarks, against, is_opening {select_fields}
@@ -194,12 +194,15 @@
 	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):
-				conditions.append("{0} in (%({0})s)".format(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.append("{0} in %({0})s".format(dimension.fieldname))
 
 	return "and {}".format(" and ".join(conditions)) if conditions else ""
 
@@ -360,6 +363,12 @@
 
 	columns = [
 		{
+			"fieldname": "gl_entry",
+			"fieldtype": "Link",
+			"options": "GL Entry",
+			"hidden": 1
+		},
+		{
 			"label": _("Posting Date"),
 			"fieldname": "posting_date",
 			"fieldtype": "Date",
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 11f4e0d..127f313 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -201,7 +201,8 @@
 		{
 			'label': _('Mode Of Payment'),
 			'fieldname': 'mode_of_payment',
-			'fieldtype': 'Data',
+			'fieldtype': 'Link',
+			'options': 'Mode of Payment',
 			'width': 120
 		},
 		{
@@ -309,6 +310,8 @@
 
 	if additional_query_columns:
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
+	else:
+		additional_query_columns = ''
 
 	return frappe.db.sql("""
 		select
@@ -320,7 +323,7 @@
 			`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
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 786e04d..0c8957a 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -373,6 +373,8 @@
 
 	if additional_query_columns:
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
+	else:
+		additional_query_columns = ''
 
 	return frappe.db.sql("""
 		select
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 2be90bc..9864e40 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -6,7 +6,7 @@
 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 @@
 			 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
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 69285cc..5fe6b41 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -7,7 +7,7 @@
 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 @@
 
 		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 @@
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:
-			if filters.get(dimension):
-				additional_conditions += """ and {0} in (%({0})s) """.format(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))
+				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("""
diff --git a/erpnext/agriculture/desk_page/agriculture/agriculture.json b/erpnext/agriculture/desk_page/agriculture/agriculture.json
index b100ddf..6020d62 100644
--- a/erpnext/agriculture/desk_page/agriculture/agriculture.json
+++ b/erpnext/agriculture/desk_page/agriculture/agriculture.json
@@ -20,9 +20,11 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "idx": 0,
+ "is_standard": 1,
  "label": "Agriculture",
- "modified": "2020-03-05 11:27:25.738073",
+ "modified": "2020-03-12 16:30:37.565413",
  "modified_by": "Administrator",
  "module": "Agriculture",
  "name": "Agriculture",
diff --git a/erpnext/assets/desk_page/assets/assets.json b/erpnext/assets/desk_page/assets/assets.json
index c737b24..f9c65cb 100644
--- a/erpnext/assets/desk_page/assets/assets.json
+++ b/erpnext/assets/desk_page/assets/assets.json
@@ -21,10 +21,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Assets",
- "modified": "2020-03-05 11:27:25.866520",
+ "modified": "2020-03-12 16:30:38.651019",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Assets",
diff --git a/erpnext/assets/doctype/location/location.json b/erpnext/assets/doctype/location/location.json
index 3323dae..6a35130 100644
--- a/erpnext/assets/doctype/location/location.json
+++ b/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": [
   {
diff --git a/erpnext/buying/desk_page/buying/buying.json b/erpnext/buying/desk_page/buying/buying.json
index 0f078f3..ae8a605 100644
--- a/erpnext/buying/desk_page/buying/buying.json
+++ b/erpnext/buying/desk_page/buying/buying.json
@@ -46,10 +46,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Buying",
- "modified": "2020-03-05 11:27:26.007461",
+ "modified": "2020-03-12 16:30:40.779078",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Buying",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index a3264a4..3111a3a 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -499,7 +499,8 @@
 						reference_doctype: me.frm.doctype,
 						reference_name: me.frm.docname,
 						content: __('Reason for hold: ')+data.reason_for_hold,
-						comment_email: frappe.session.user
+						comment_email: frappe.session.user,
+						comment_by: frappe.session.user_fullname
 					},
 					callback: function(r) {
 						if(!r.exc) {
diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py
index b3b294d..d0d5b73 100644
--- a/erpnext/buying/doctype/supplier/supplier_dashboard.py
+++ b/erpnext/buying/doctype/supplier/supplier_dashboard.py
@@ -34,4 +34,4 @@
 				'items': ['Pricing Rule']
 			}
 		]
-	}
+	}
\ No newline at end of file
diff --git a/erpnext/communication/desk_page/communication/communication.json b/erpnext/communication/desk_page/communication/communication.json
deleted file mode 100644
index 7ad383e..0000000
--- a/erpnext/communication/desk_page/communication/communication.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "cards": [],
- "charts": [],
- "creation": "2020-01-28 11:49:55.003637",
- "developer_mode_only": 0,
- "disable_user_customization": 0,
- "docstatus": 0,
- "doctype": "Desk Page",
- "icon": "",
- "idx": 0,
- "label": "Communication",
- "modified": "2020-03-05 11:27:25.989412",
- "modified_by": "Administrator",
- "module": "Communication",
- "name": "Communication",
- "owner": "Administrator",
- "pin_to_bottom": 0,
- "pin_to_top": 0,
- "shortcuts": []
-}
\ No newline at end of file
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 8d3db8d..fcc9098 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -672,19 +672,32 @@
 					# If asset has to be auto created
 					# Check for asset naming series
 					if item_data.get('asset_naming_series'):
+						created_assets = []
+
 						for qty in range(cint(d.qty)):
-							self.make_asset(d)
-						is_plural = 's' if cint(d.qty) != 1 else ''
-						messages.append(_('{0} Asset{2} Created for <b>{1}</b>').format(cint(d.qty), d.item_code, is_plural))
+							asset = self.make_asset(d)
+							created_assets.append(asset)
+						
+						if len(created_assets) > 5:
+							# dont show asset form links if more than 5 assets are created
+							messages.append(_('{} Asset{} created for {}').format(len(created_assets), is_plural, frappe.bold(d.item_code)))
+						else:
+							assets_link = list(map(lambda d: frappe.utils.get_link_to_form('Asset', d), created_assets))
+							assets_link = frappe.bold(','.join(assets_link))
+
+							is_plural = 's' if len(created_assets) != 1 else ''
+							messages.append(
+								_('Asset{} {assets_link} created for {}').format(is_plural, frappe.bold(d.item_code), assets_link=assets_link)
+							)
 					else:
-						frappe.throw(_("Row {1}: Asset Naming Series is mandatory for the auto creation for item {0}")
-							.format(d.item_code, d.idx))
+						frappe.throw(_("Row {}: Asset Naming Series is mandatory for the auto creation for item {}")
+							.format(d.idx, frappe.bold(d.item_code)))
 				else:
-					messages.append(_("Assets not created for <b>{0}</b>. You will have to create asset manually.")
-						.format(d.item_code))
+					messages.append(_("Assets not created for {0}. You will have to create asset manually.")
+						.format(frappe.bold(d.item_code)))
 
 		for message in messages:
-			frappe.msgprint(message, title="Success")
+			frappe.msgprint(message, title="Success", indicator="green")
 
 	def make_asset(self, row):
 		if not row.asset_location:
@@ -716,6 +729,8 @@
 		asset.set_missing_values()
 		asset.insert()
 
+		return asset.name
+
 	def update_fixed_asset(self, field, delete_asset = False):
 		for d in self.get("items"):
 			if d.is_fixed_asset:
@@ -745,7 +760,7 @@
 							asset.supplier = None
 						if asset.docstatus == 1 and delete_asset:
 							frappe.throw(_('Cannot cancel this document as it is linked with submitted asset {0}.\
-								Please cancel the it to continue.').format(asset.name))
+								Please cancel the it to continue.').format(frappe.utils.get_link_to_form('Asset', asset.name)))
 
 					asset.flags.ignore_validate_update_after_submit = True
 					asset.flags.ignore_mandatory = True
@@ -1026,4 +1041,4 @@
 			available_batches.append({'batch': batch, 'qty': available_qty})
 			required_qty -= available_qty
 
-	return available_batches
\ No newline at end of file
+	return available_batches
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index d18f8e5..163ef72 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+import erpnext
 from frappe.desk.reportview import get_match_cond, get_filters_cond
 from frappe.utils import nowdate, getdate
 from collections import defaultdict
@@ -129,23 +130,26 @@
 		})
 
 def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
+	company_currency = erpnext.get_company_currency(filters.get('company'))
+
 	tax_accounts = frappe.db.sql("""select name, parent_account	from tabAccount
 		where tabAccount.docstatus!=2
 			and account_type in (%s)
 			and is_group = 0
 			and company = %s
+			and account_currency = %s
 			and `%s` LIKE %s
 		order by idx desc, name
 		limit %s, %s""" %
-		(", ".join(['%s']*len(filters.get("account_type"))), "%s", searchfield, "%s", "%s", "%s"),
-		tuple(filters.get("account_type") + [filters.get("company"), "%%%s%%" % txt,
+		(", ".join(['%s']*len(filters.get("account_type"))), "%s", "%s", searchfield, "%s", "%s", "%s"),
+		tuple(filters.get("account_type") + [filters.get("company"), company_currency, "%%%s%%" % txt,
 			start, page_len]))
 	if not tax_accounts:
 		tax_accounts = frappe.db.sql("""select name, parent_account	from tabAccount
 			where tabAccount.docstatus!=2 and is_group = 0
-				and company = %s and `%s` LIKE %s limit %s, %s"""
-			% ("%s", searchfield, "%s", "%s", "%s"),
-			(filters.get("company"), "%%%s%%" % txt, start, page_len))
+				and company = %s and account_currency = %s and `%s` LIKE %s limit %s, %s""" #nosec
+			% ("%s", "%s", searchfield, "%s", "%s", "%s"),
+			(filters.get("company"), company_currency, "%%%s%%" % txt, start, page_len))
 
 	return tax_accounts
 
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index b465a10..4d0520a 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -69,6 +69,17 @@
 		["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'"],
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index d452fe4..f6908c0 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -238,7 +238,7 @@
 		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)
 
diff --git a/erpnext/crm/desk_page/crm/crm.json b/erpnext/crm/desk_page/crm/crm.json
index 36ea3bb..9ebbe27 100644
--- a/erpnext/crm/desk_page/crm/crm.json
+++ b/erpnext/crm/desk_page/crm/crm.json
@@ -28,10 +28,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "CRM",
- "modified": "2020-03-05 11:27:26.045510",
+ "modified": "2020-03-12 16:30:41.142037",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "CRM",
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index bc007b1..5299368 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -171,7 +171,6 @@
    "options": "Customer"
   },
   {
-   "depends_on": "eval: doc.source==\"Campaign\"",
    "fieldname": "campaign_name",
    "fieldtype": "Link",
    "label": "Campaign Name",
@@ -512,4 +511,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 0e2068a..08be34e 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/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",
diff --git a/erpnext/demo/user/fixed_asset.py b/erpnext/demo/user/fixed_asset.py
index e6d1687..dc094e1 100644
--- a/erpnext/demo/user/fixed_asset.py
+++ b/erpnext/demo/user/fixed_asset.py
@@ -6,46 +6,28 @@
 
 import frappe
 from frappe.utils.make_random import get_random
-from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
+from erpnext.assets.doctype.asset.asset import make_sales_invoice
 from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries, scrap_asset
 
+
 def work():
 	frappe.set_user(frappe.db.get_global('demo_accounts_user'))
 
-	asset_list = make_asset_purchase_entry()
-
-	if not asset_list:
-		# fixed_asset.work() already run
-		return
-		
 	# Enable booking asset depreciation entry automatically
 	frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
-		
+
 	# post depreciation entries as on today
 	post_depreciation_entries()
-	
+
 	# scrap a random asset
 	frappe.db.set_value("Company", "Wind Power LLC", "disposal_account", "Gain/Loss on Asset Disposal - WPL")
-	
+
 	asset = get_random_asset()
 	scrap_asset(asset.name)
-	
-	# Sell a random asset
-	sell_an_asset()	
 
-def make_asset_purchase_entry():
-	asset_list = frappe.get_all("Asset", filters={"purchase_invoice": ["in", ("", None)]}, 
-		fields=["name", "item_code", "gross_purchase_amount", "company", "purchase_date"])
-				
-	# make purchase invoice
-	for asset in asset_list:
-		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount, 
-			asset.company, asset.purchase_date)
-		pi.supplier = get_random("Supplier")
-		pi.save()
-		pi.submit()
-		
-	return asset_list
+	# Sell a random asset
+	sell_an_asset()
+
 
 def sell_an_asset():
 	asset = get_random_asset()
@@ -55,8 +37,9 @@
 		if asset.value_after_depreciation else asset.gross_purchase_amount * 0.9
 	si.save()
 	si.submit()
-	
+
+
 def get_random_asset():
 	return frappe.db.sql(""" select name, item_code, value_after_depreciation, gross_purchase_amount
-		from `tabAsset` 
+		from `tabAsset`
 		where docstatus=1 and status not in ("Scrapped", "Sold") order by rand() limit 1""", as_dict=1)[0]
diff --git a/erpnext/education/desk_page/education/education.json b/erpnext/education/desk_page/education/education.json
index 6e85aae..bbd8ead 100644
--- a/erpnext/education/desk_page/education/education.json
+++ b/erpnext/education/desk_page/education/education.json
@@ -60,9 +60,11 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "idx": 0,
+ "is_standard": 1,
  "label": "Education",
- "modified": "2020-03-05 11:27:25.706693",
+ "modified": "2020-03-12 16:30:37.217514",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Education",
diff --git a/erpnext/education/doctype/assessment_group/assessment_group.json b/erpnext/education/doctype/assessment_group/assessment_group.json
index 56917d2..a8ffaf4 100644
--- a/erpnext/education/doctype/assessment_group/assessment_group.json
+++ b/erpnext/education/doctype/assessment_group/assessment_group.json
@@ -1,274 +1,90 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:assessment_group_name", 
- "beta": 0, 
- "creation": "2016-08-04 04:42:48.319388", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:assessment_group_name",
+ "creation": "2016-08-04 04:42:48.319388",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "field_order": [
+  "assessment_group_name",
+  "is_group",
+  "section_break_2",
+  "parent_assessment_group",
+  "lft",
+  "rgt",
+  "old_parent"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_group_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "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
-  }, 
+   "fieldname": "assessment_group_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Assessment Group Name",
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 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": 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
-  }, 
+   "default": "0",
+   "fieldname": "is_group",
+   "fieldtype": "Check",
+   "label": "Is Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "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
-  }, 
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break",
+   "hidden": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "parent_assessment_group", 
-   "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
-  }, 
+   "fieldname": "parent_assessment_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Parent Assessment Group",
+   "options": "Assessment Group",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "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
-  }, 
+   "fieldname": "lft",
+   "fieldtype": "Int",
+   "label": "lft"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "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
-  }, 
+   "fieldname": "rgt",
+   "fieldtype": "Int",
+   "label": "rgt"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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
+   "fieldname": "old_parent",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "old_parent",
+   "options": "Assessment Group"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-10 19:09:25.366400", 
- "modified_by": "Administrator", 
- "module": "Education", 
- "name": "Assessment Group", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_tree": 1,
+ "links": [],
+ "modified": "2020-03-18 18:01:14.710416",
+ "modified_by": "Administrator",
+ "module": "Education",
+ "name": "Assessment Group",
+ "nsm_parent_field": "parent_assessment_group",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Academics User",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "restrict_to_domain": "Education",
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/education/doctype/course/course.json b/erpnext/education/doctype/course/course.json
index 68426c3..da10db1 100644
--- a/erpnext/education/doctype/course/course.json
+++ b/erpnext/education/doctype/course/course.json
@@ -74,7 +74,7 @@
   }
  ],
  "image_field": "hero_image",
- "modified": "2019-06-12 12:34:23.748157",
+ "modified": "2020-03-29 12:50:27.677589",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Course",
@@ -103,6 +103,30 @@
    "role": "Instructor",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Education Manager",
+   "share": 1,
+   "write": 1
   }
  ],
  "restrict_to_domain": "Education",
diff --git a/erpnext/healthcare/desk_page/healthcare/healthcare.json b/erpnext/healthcare/desk_page/healthcare/healthcare.json
index 0160cd4..258a72c 100644
--- a/erpnext/healthcare/desk_page/healthcare/healthcare.json
+++ b/erpnext/healthcare/desk_page/healthcare/healthcare.json
@@ -28,9 +28,11 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "idx": 0,
+ "is_standard": 1,
  "label": "Healthcare",
- "modified": "2020-03-05 11:27:25.682521",
+ "modified": "2020-03-12 16:30:36.952979",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Healthcare",
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
index 6e92455..8601f69 100644
--- a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
@@ -1,542 +1,205 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:healthcare_service_unit_name",
  "beta": 1,
  "creation": "2016-09-21 13:48:14.731437",
- "custom": 0,
  "description": "Healthcare Service Unit",
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Setup",
  "editable_grid": 1,
+ "field_order": [
+  "healthcare_service_unit_name",
+  "parent_healthcare_service_unit",
+  "is_group",
+  "service_unit_type",
+  "allow_appointments",
+  "overlap_appointments",
+  "inpatient_occupancy",
+  "occupancy_status",
+  "warehouse",
+  "company",
+  "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": "healthcare_service_unit_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_global_search": 1,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Service Unit",
-   "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,
-   "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_healthcare_service_unit",
    "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 Service Unit",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Healthcare Service Unit",
-   "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
+   "options": "Healthcare Service Unit"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
    "depends_on": "eval:doc.inpatient_occupancy != 1 && doc.allow_appointments != 1",
    "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",
-   "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
+   "label": "Is Group"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:doc.is_group != 1",
    "fieldname": "service_unit_type",
    "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": "Service Unit Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Healthcare Service Unit Type",
-   "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
+   "options": "Healthcare Service Unit Type"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
    "depends_on": "eval:doc.is_group != 1 && doc.inpatient_occupancy != 1",
    "fetch_from": "service_unit_type.allow_appointments",
    "fieldname": "allow_appointments",
    "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": "Allow Appointments",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
    "depends_on": "eval:doc.is_group != 1 && doc.allow_appointments == 1 && doc.inpatient_occupany != 1",
    "fetch_from": "service_unit_type.overlap_appointments",
    "fieldname": "overlap_appointments",
    "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": "Allow Overlap",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
    "depends_on": "eval:doc.allow_appointments != 1 && doc.is_group != 1",
    "fetch_from": "service_unit_type.inpatient_occupancy",
    "fieldname": "inpatient_occupancy",
    "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": "Inpatient Occupancy",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
    "depends_on": "eval:doc.inpatient_occupancy == 1",
    "fieldname": "occupancy_status",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Occupancy Status",
-   "length": 0,
    "no_copy": 1,
    "options": "Vacant\nOccupied",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:doc.is_group != 1",
    "fieldname": "warehouse",
    "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": "Warehouse",
-   "length": 0,
    "no_copy": 1,
-   "options": "Warehouse",
-   "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
+   "options": "Warehouse"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "company",
    "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": 1,
    "label": "Company",
-   "length": 0,
-   "no_copy": 0,
    "options": "Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
    "remember_last_selected_value": 1,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "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": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "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": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "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": "Healthcare Service Unit",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "report_hide": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-10-04 21:09:52.261882",
+ "is_tree": 1,
+ "links": [],
+ "modified": "2020-03-18 18:02:23.713439",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Healthcare Service Unit",
- "name_case": "",
+ "nsm_parent_field": "parent_healthcare_service_unit",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Nursing User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 0
+   "share": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Healthcare Administrator",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
-   "delete": 0,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Physician",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
  "restrict_to_domain": "Healthcare",
  "search_fields": "healthcare_service_unit_name",
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "healthcare_service_unit_name",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
index d562245..5f48c9f 100755
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
@@ -386,5 +386,5 @@
 	return frappe.db.sql("""select pp.name, pp.procedure, pp.parent, ct.practitioner,
 	ct.encounter_date, pp.practitioner, pp.date, pp.department
 	from `tabPatient Encounter` ct, `tabProcedure Prescription` pp
-	where ct.patient='{0}' and pp.parent=ct.name and pp.appointment_booked=0
-	order by ct.creation desc""".format(patient))
+	where ct.patient=%(patient)s and pp.parent=ct.name and pp.appointment_booked=0
+	order by ct.creation desc""", {"patient": patient})
diff --git a/erpnext/hr/desk_page/hr/hr.json b/erpnext/hr/desk_page/hr/hr.json
index 6955484..ec38ef0 100644
--- a/erpnext/hr/desk_page/hr/hr.json
+++ b/erpnext/hr/desk_page/hr/hr.json
@@ -70,10 +70,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "HR",
- "modified": "2020-03-05 11:27:25.493284",
+ "modified": "2020-03-12 16:30:35.211246",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR",
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index a191b6b..6469f4c 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/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": [
   {
diff --git a/erpnext/hr/doctype/department/department.py b/erpnext/hr/doctype/department/department.py
index 9b2b581..2cef509 100644
--- a/erpnext/hr/doctype/department/department.py
+++ b/erpnext/hr/doctype/department/department.py
@@ -48,12 +48,17 @@
 @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 @@
 		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():
diff --git a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
index fea4246..feaa925 100644
--- a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
+++ b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
@@ -190,6 +190,7 @@
 	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")
diff --git a/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json b/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
index 96ad1b7..d68caf1 100644
--- a/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
+++ b/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",
diff --git a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
index 3770da7..e9dc776 100644
--- a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
+++ b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
@@ -6,11 +6,14 @@
 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),
diff --git a/erpnext/hr/doctype/vehicle_log/vehicle_log.js b/erpnext/hr/doctype/vehicle_log/vehicle_log.js
index bdb37d2..6f3a0dc 100644
--- a/erpnext/hr/doctype/vehicle_log/vehicle_log.js
+++ b/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 @@
 		}
 	},
 
-	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",
diff --git a/erpnext/hr/doctype/vehicle_log/vehicle_log.json b/erpnext/hr/doctype/vehicle_log/vehicle_log.json
index 52effff..619e295 100644
--- a/erpnext/hr/doctype/vehicle_log/vehicle_log.json
+++ b/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-01-28 12:43:34.419647",
+ "modified": "2020-03-18 16:45:45.060761",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Vehicle Log",
diff --git a/erpnext/hr/doctype/vehicle_log/vehicle_log.py b/erpnext/hr/doctype/vehicle_log/vehicle_log.py
index 12cc1dd..8affab2 100644
--- a/erpnext/hr/doctype/vehicle_log/vehicle_log.py
+++ b/erpnext/hr/doctype/vehicle_log/vehicle_log.py
@@ -12,18 +12,7 @@
 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))
-		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]
+			frappe.throw(_("Current Odometer Value should be greater than Last Odometer Value {0}").format(self.last_odometer))
 
 	def on_submit(self):
 		frappe.db.set_value("Vehicle", self.license_plate, "last_odometer", self.odometer)
@@ -35,34 +24,25 @@
 			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():
-		exp_claim = frappe.db.sql("""select name from `tabExpense Claim` where vehicle_log=%s""",vehicle_log.name)
-		return exp_claim[0][0] if exp_claim else ""
-	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
+	expense_claim = frappe.db.exists("Expense Claim", {"vehicle_log": docname})
+	if expense_claim:
+		frappe.throw(_("Expense Claim {0} already exists for the Vehicle Log").format(expense_claim))
 
 	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.vehicle_log=vehicle_log.name
-	exp_claim.remark=_("Expense Claim for Vehicle Log {0}").format(vehicle_log.name)
-	fuel_price=vehicle_log.price
-	total_claim_amt=calc_service_exp() + fuel_price
-	exp_claim.append("expenses",{
-		"expense_date":vehicle_log.date,
-		"description":_("Vehicle Expenses"),
-		"amount":total_claim_amt
+	exp_claim.employee = vehicle_log.employee
+	exp_claim.vehicle_log = vehicle_log.name
+	exp_claim.remark = _("Expense Claim for Vehicle Log {0}").format(vehicle_log.name)
+	exp_claim.append("expenses", {
+		"expense_date": vehicle_log.date,
+		"description": _("Vehicle Expenses"),
+		"amount": claim_amount
 	})
 	return exp_claim.as_dict()
diff --git a/erpnext/hr/doctype/vehicle_service/vehicle_service.json b/erpnext/hr/doctype/vehicle_service/vehicle_service.json
index 7d9d0df..e0bce2b 100644
--- a/erpnext/hr/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/hr/doctype/vehicle_service/vehicle_service.json
@@ -1,153 +1,57 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-09-03 19:20:14.561962", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
+ "creation": "2016-09-03 19:20:14.561962",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "service_item",
+  "type",
+  "frequency",
+  "expense_amount"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "service_item", 
-   "fieldtype": "Select", 
-   "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
-  }, 
+   "fieldname": "service_item",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Service Item",
+   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "type", 
-   "fieldtype": "Select", 
-   "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
-  }, 
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Type",
+   "options": "\nInspection\nService\nChange",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "frequency", 
-   "fieldtype": "Select", 
-   "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
-  }, 
+   "fieldname": "frequency",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Frequency",
+   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_amount", 
-   "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
+   "fieldname": "expense_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Expense",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-01-09 11:10:29.476907", 
- "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
+ ],
+ "istable": 1,
+ "modified": "2020-03-18 16:49:46.645004",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Vehicle Service",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/loan_management/desk_page/loan_management/loan_management.json b/erpnext/loan_management/desk_page/loan_management/loan_management.json
new file mode 100644
index 0000000..1d60ca4
--- /dev/null
+++ b/erpnext/loan_management/desk_page/loan_management/loan_management.json
@@ -0,0 +1,54 @@
+{
+ "cards": [
+  {
+   "links": "[\n    {\n        \"description\": \"Loan Type for interest and penalty rates\",\n        \"label\": \"Loan Type\",\n        \"name\": \"Loan Type\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Loan Applications from customers and employees.\",\n        \"label\": \"Loan Application\",\n        \"name\": \"Loan Application\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Loans provided to customers and employees.\",\n        \"label\": \"Loan\",\n        \"name\": \"Loan\",\n        \"type\": \"doctype\"\n    }\n]",
+   "title": "Loan"
+  },
+  {
+   "links": "[\n    {\n        \"label\": \"Process Loan Security Shortfall\",\n        \"name\": \"Process Loan Security Shortfall\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Process Loan Interest Accrual\",\n        \"name\": \"Process Loan Interest Accrual\",\n        \"type\": \"doctype\"\n    }\n]",
+   "title": "Loan Processes"
+  },
+  {
+   "links": "[\n    {\n        \"label\": \"Loan Disbursement\",\n        \"name\": \"Loan Disbursement\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Repayment\",\n        \"name\": \"Loan Repayment\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Interest Accrual\",\n        \"name\": \"Loan Interest Accrual\",\n        \"type\": \"doctype\"\n    }\n]",
+   "title": "Disbursement and Repayment"
+  },
+  {
+   "links": "[\n    {\n        \"label\": \"Loan Security Type\",\n        \"name\": \"Loan Security Type\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Security Price\",\n        \"name\": \"Loan Security Price\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Security\",\n        \"name\": \"Loan Security\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Security Pledge\",\n        \"name\": \"Loan Security Pledge\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Security Unpledge\",\n        \"name\": \"Loan Security Unpledge\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Loan Security Shortfall\",\n        \"name\": \"Loan Security Shortfall\",\n        \"type\": \"doctype\"\n    }\n]",
+   "title": "Loan Security"
+  },
+  {
+   "links": "[\n    {\n        \"dependencies\": [\n            \"Loan Repayment\"\n        ],\n        \"doctype\": \"Loan Repayment\",\n        \"incomplete_dependencies\": [\n            \"Loan Repayment\"\n        ],\n        \"is_query_report\": true,\n        \"label\": \"Loan Repayment and Closure\",\n        \"name\": \"Loan Repayment and Closure\",\n        \"route\": \"#query-report/Loan Repayment and Closure\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Loan Security Pledge\"\n        ],\n        \"doctype\": \"Loan Security Pledge\",\n        \"incomplete_dependencies\": [\n            \"Loan Security Pledge\"\n        ],\n        \"is_query_report\": true,\n        \"label\": \"Loan Security Status\",\n        \"name\": \"Loan Security Status\",\n        \"route\": \"#query-report/Loan Security Status\",\n        \"type\": \"report\"\n    }\n]",
+   "title": "Reports"
+  }
+ ],
+ "category": "Modules",
+ "charts": [],
+ "creation": "2020-03-12 16:35:55.299820",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends_another_page": 0,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "Loan Management",
+ "modified": "2020-03-12 16:38:00.347959",
+ "modified_by": "Administrator",
+ "module": "Loan Management",
+ "name": "Loan Management",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": [
+  {
+   "is_query_report": 0,
+   "link_to": "Loan Application",
+   "type": "DocType"
+  },
+  {
+   "is_query_report": 0,
+   "link_to": "Loan",
+   "type": "DocType"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan/test_loan.py b/erpnext/loan_management/doctype/loan/test_loan.py
index 08c2f22..759b0d8 100644
--- a/erpnext/loan_management/doctype/loan/test_loan.py
+++ b/erpnext/loan_management/doctype/loan/test_loan.py
@@ -273,11 +273,11 @@
 
 		penalty_amount = (accrued_interest_amount * 4 * 25) / (100 * days_in_year(get_datetime(first_date).year))
 
-		lia = frappe.get_all("Loan Interest Accrual", fields=["is_paid"],
-			filters={"loan": loan.name}, order_by="posting_date")
+		lia1 = frappe.get_value("Loan Interest Accrual", {"loan": loan.name, "is_paid": 1}, 'name')
+		lia2 = frappe.get_value("Loan Interest Accrual", {"loan": loan.name, "is_paid": 0}, 'name')
 
-		self.assertTrue(lia[0].get('is_paid'))
-		self.assertFalse(lia[1].get('is_paid'))
+		self.assertTrue(lia1)
+		self.assertTrue(lia2)
 
 	def test_security_shortfall(self):
 		pledges = []
@@ -294,18 +294,21 @@
 
 		make_loan_disbursement_entry(loan.name, loan.loan_amount)
 
-		frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = %s
-		where loan_security=%s""", (100, 'Test Security 2'))
+		frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = 100
+			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 @@
 			"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():
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
index a3442e4..b8e6dab 100644
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
+++ b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
@@ -130,9 +130,10 @@
 			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`
-		SET is_accrued = 1 where name in (%s)""" #nosec
-		% ", ".join(['%s']*len(accrued_entries)), tuple(accrued_entries))
+	if accrued_entries:
+		frappe.db.sql("""UPDATE `tabRepayment Schedule`
+			SET is_accrued = 1 where name in (%s)""" #nosec
+			% ", ".join(['%s']*len(accrued_entries)), tuple(accrued_entries))
 
 def 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):
diff --git a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
index c8ade46..6127ef6 100644
--- a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
@@ -36,9 +36,11 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "idx": 0,
+ "is_standard": 1,
  "label": "Manufacturing",
- "modified": "2020-03-05 11:27:25.627824",
+ "modified": "2020-03-12 16:30:36.389877",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Manufacturing",
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 3acaee4..0051ad9 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -43,8 +43,7 @@
 
 		frm.set_query("item_code", "items", function() {
 			return {
-				query: "erpnext.controllers.queries.item_query",
-				filters: [["Item", "name", "!=", cur_frm.doc.item]]
+				query: "erpnext.controllers.queries.item_query"
 			};
 		});
 
@@ -135,6 +134,7 @@
 			frappe.call({
 				method: "erpnext.manufacturing.doctype.work_order.work_order.make_work_order",
 				args: {
+					bom_no: frm.doc.name,
 					item: frm.doc.item,
 					qty: data.qty || 0.0,
 					project: frm.doc.project
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 7f8bd67..b3e602b 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -114,10 +114,6 @@
 				child = self.append('operations', d)
 				child.hour_rate = flt(d.hour_rate / self.conversion_rate, 2)
 
-	def validate_rm_item(self, item):
-		if (item[0]['name'] in [it.item_code for it in self.items]) and item[0]['name'] == self.item:
-			frappe.throw(_("BOM #{0}: Raw material cannot be same as main Item").format(self.name))
-
 	def set_bom_material_details(self):
 		for item in self.get("items"):
 			self.validate_bom_currecny(item)
@@ -147,7 +143,6 @@
 			args = json.loads(args)
 
 		item = self.get_item_det(args['item_code'])
-		self.validate_rm_item(item)
 
 		args['bom_no'] = args['bom_no'] or item and cstr(item[0]['default_bom']) or ''
 		args['transfer_for_manufacture'] = (cstr(args.get('include_item_in_manufacturing', '')) or
@@ -498,6 +493,14 @@
 		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 +830,10 @@
 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)
 
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
index 31a9fdb..2758a42 100644
--- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
+++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
@@ -14,10 +14,13 @@
 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 @@
 				# 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 @@
 			!= 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):
-		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
-
+	def update_new_bom(self, unit_cost):
 		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 @@
 
 		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()
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index bc8c229..8c7876d 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -20,7 +20,7 @@
 			}
 		}
 
-		if (frm.doc.docstatus == 0 && frm.doc.for_quantity > frm.doc.total_completed_qty
+		if (frm.doc.docstatus == 0 && (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity)
 			&& (!frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)) {
 			frm.trigger("prepare_timer_buttons");
 		}
@@ -59,10 +59,14 @@
 				let completed_time = frappe.datetime.now_datetime();
 				frm.trigger("hide_timer");
 
-				frappe.prompt({fieldtype: 'Float', label: __('Completed Quantity'),
-					fieldname: 'qty', reqd: 1, default: frm.doc.for_quantity}, data => {
-					frm.events.complete_job(frm, completed_time, data.qty);
-				}, __("Enter Value"), __("Complete"));
+				if (frm.doc.for_quantity) {
+					frappe.prompt({fieldtype: 'Float', label: __('Completed Quantity'),
+						fieldname: 'qty', reqd: 1, default: frm.doc.for_quantity}, data => {
+							frm.events.complete_job(frm, completed_time, data.qty);
+						}, __("Enter Value"), __("Complete"));
+				} else {
+					frm.events.complete_job(frm, completed_time, 0);
+				}
 			}).addClass("btn-primary");
 		}
 	},
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index 156acce..7661fff 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -99,8 +99,7 @@
    "fieldname": "for_quantity",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "label": "Qty To Manufacture",
-   "reqd": 1
+   "label": "Qty To Manufacture"
   },
   {
    "fieldname": "wip_warehouse",
@@ -122,6 +121,7 @@
    "options": "Employee"
   },
   {
+   "allow_bulk_edit": 1,
    "fieldname": "time_logs",
    "fieldtype": "Table",
    "label": "Time Logs",
@@ -290,7 +290,7 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-12-03 13:08:57.926201",
+ "modified": "2020-03-27 13:36:35.417502",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 029db1c..f8c60f2 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -191,12 +191,9 @@
 		if not self.time_logs:
 			frappe.throw(_("Time logs are required for job card {0}").format(self.name))
 
-		if self.total_completed_qty <= 0.0:
-			frappe.throw(_("Total completed qty must be greater than zero"))
-
-		if self.total_completed_qty != self.for_quantity:
-			frappe.throw(_("The total completed qty({0}) must be equal to qty to manufacture({1})")
-				.format(frappe.bold(self.total_completed_qty),frappe.bold(self.for_quantity)))
+		if self.for_quantity and self.total_completed_qty != self.for_quantity:
+			frappe.throw(_("The total completed qty({0}) must be equal to qty to manufacture({1})"
+				.format(frappe.bold(self.total_completed_qty),frappe.bold(self.for_quantity))))
 
 	def update_work_order(self):
 		if not self.work_order:
@@ -205,27 +202,34 @@
 		for_quantity, time_in_mins = 0, 0
 		from_time_list, to_time_list = [], []
 
-		for d in frappe.get_all('Job Card',
-			filters = {'docstatus': 1, 'operation_id': self.operation_id}):
-			doc = frappe.get_doc('Job Card', d.name)
 
-			for_quantity += doc.total_completed_qty
-			time_in_mins += doc.total_time_in_mins
-			for time_log in doc.time_logs:
-				if time_log.from_time:
-					from_time_list.append(time_log.from_time)
-				if time_log.to_time:
-					to_time_list.append(time_log.to_time)
+		data = frappe.get_all('Job Card',
+			fields = ["sum(total_time_in_mins) as time_in_mins", "sum(total_completed_qty) as completed_qty"],
+			filters = {"docstatus": 1, "work_order": self.work_order,
+				"workstation": self.workstation, "operation": self.operation})
+
+		if data and len(data) > 0:
+			for_quantity = data[0].completed_qty
+			time_in_mins = data[0].time_in_mins
 
 		if for_quantity:
+			time_data = frappe.db.sql("""
+				SELECT
+					min(from_time) as start_time, max(to_time) as end_time
+				FROM `tabJob Card` jc, `tabJob Card Time Log` jctl
+				WHERE
+					jctl.parent = jc.name and jc.work_order = %s
+					and jc.workstation = %s and jc.operation = %s and jc.docstatus = 1
+			""", (self.work_order, self.workstation, self.operation), as_dict=1)
+
 			wo = frappe.get_doc('Work Order', self.work_order)
 
 			for data in wo.operations:
-				if data.name == self.operation_id:
+				if data.workstation == self.workstation and data.operation == self.operation:
 					data.completed_qty = for_quantity
 					data.actual_operation_time = time_in_mins
-					data.actual_start_time = min(from_time_list) if from_time_list else None
-					data.actual_end_time = max(to_time_list) if to_time_list else None
+					data.actual_start_time = time_data[0].start_time if time_data else None
+					data.actual_end_time = time_data[0].end_time if time_data else None
 
 			wo.flags.ignore_validate_update_after_submit = True
 			wo.update_operation_status()
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index 0a8f41f..2260bef 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -14,6 +14,7 @@
 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 @@
 		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 @@
 	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()
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index dd4a872..84bfab2 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -279,7 +279,7 @@
 			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}.")
@@ -314,7 +314,7 @@
 		stock_entry = frappe.db.sql("""select name from `tabStock Entry`
 			where work_order = %s and docstatus = 1""", self.name)
 		if stock_entry:
-			frappe.throw(_("Cannot cancel because submitted Stock Entry {0} exists").format(stock_entry[0][0]))
+			frappe.throw(_("Cannot cancel because submitted Stock Entry {0} exists").format(frappe.utils.get_link_to_form('Stock Entry', stock_entry[0][0])))
 
 	def update_planned_qty(self):
 		update_bin_qty(self.production_item, self.fg_warehouse, {
@@ -468,6 +468,9 @@
 		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 @@
 			# 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:
@@ -552,24 +552,33 @@
 			d.db_set('transferred_qty', flt(transferred_qty), update_modified = False)
 
 	def update_consumed_qty_for_required_items(self):
-		'''update consumed qty from submitted stock entries for that item against
-			the work order'''
+		'''
+			Update consumed qty from submitted stock entries
+			against a work order for each stock item
+		'''
 
-		for d in self.required_items:
-			consumed_qty = frappe.db.sql('''select sum(qty)
-				from `tabStock Entry` entry, `tabStock Entry Detail` detail
-				where
+		for item in self.required_items:
+			consumed_qty = frappe.db.sql('''
+				SELECT
+					SUM(qty)
+				FROM
+					`tabStock Entry` entry,
+					`tabStock Entry Detail` detail
+				WHERE
 					entry.work_order = %(name)s
-					and (entry.purpose = "Material Consumption for Manufacture"
-					or entry.purpose = "Manufacture")
-					and entry.docstatus = 1
-					and detail.parent = entry.name
-					and (detail.item_code = %(item)s or detail.original_item = %(item)s)''', {
-						'name': self.name,
-						'item': d.item_code
-					})[0][0]
+						AND (entry.purpose = "Material Consumption for Manufacture"
+							OR entry.purpose = "Manufacture")
+						AND entry.docstatus = 1
+						AND detail.parent = entry.name
+						AND detail.s_warehouse IS NOT null
+						AND (detail.item_code = %(item)s
+							OR detail.original_item = %(item)s)
+				''', {
+					'name': self.name,
+					'item': item.item_code
+				})[0][0]
 
-			d.db_set('consumed_qty', flt(consumed_qty), update_modified = False)
+			item.db_set('consumed_qty', flt(consumed_qty), update_modified=False)
 
 	def make_bom(self):
 		data = frappe.db.sql(""" select sed.item_code, sed.qty, sed.s_warehouse
@@ -648,7 +657,7 @@
 	return res
 
 @frappe.whitelist()
-def make_work_order(item, qty=0, project=None):
+def make_work_order(bom_no, item, qty=0, project=None):
 	if not frappe.has_permission("Work Order", "write"):
 		frappe.throw(_("Not permitted"), frappe.PermissionError)
 
@@ -657,6 +666,7 @@
 	wo_doc = frappe.new_doc("Work Order")
 	wo_doc.production_item = item
 	wo_doc.update(item_details)
+	wo_doc.bom_no = bom_no
 
 	if flt(qty) > 0:
 		wo_doc.qty = flt(qty)
diff --git a/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js b/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
index 7152d3d..1bcb1ef 100644
--- a/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
+++ b/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
@@ -22,7 +22,14 @@
 					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 @@
 					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'
diff --git a/erpnext/non_profit/desk_page/non_profit/non_profit.json b/erpnext/non_profit/desk_page/non_profit/non_profit.json
index 62117ca..5d759ba 100644
--- a/erpnext/non_profit/desk_page/non_profit/non_profit.json
+++ b/erpnext/non_profit/desk_page/non_profit/non_profit.json
@@ -34,9 +34,11 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "idx": 0,
+ "is_standard": 1,
  "label": "Non Profit",
- "modified": "2020-03-05 11:27:25.655850",
+ "modified": "2020-03-12 16:30:36.683012",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Non Profit",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index b0fc7ea..8aec8bd 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -658,4 +658,5 @@
 erpnext.patches.v12_0.set_published_in_hub_tracked_item
 erpnext.patches.v12_0.set_job_offer_applicant_email
 erpnext.patches.v12_0.create_irs_1099_field_united_states
+erpnext.patches.v12_0.move_bank_account_swift_number_to_bank
 erpnext.patches.v12_0.rename_bank_reconciliation_fields # 2020-01-22
diff --git a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
new file mode 100644
index 0000000..3c9758e
--- /dev/null
+++ b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
@@ -0,0 +1,15 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc('accounts', 'doctype', 'bank', force=1)
+
+	if frappe.db.table_exists('Bank') and frappe.db.table_exists('Bank Account'):
+		frappe.db.sql("""
+			UPDATE `tabBank` b, `tabBank Account` ba
+			SET b.swift_number = ba.swift_number, b.branch_code = ba.branch_code
+			WHERE b.name = ba.bank
+		""")
+
+	frappe.reload_doc('accounts', 'doctype', 'bank_account')
+	frappe.reload_doc('accounts', 'doctype', 'payment_request')
\ No newline at end of file
diff --git a/erpnext/projects/desk_page/projects/projects.json b/erpnext/projects/desk_page/projects/projects.json
index bf362aa..13fd1b8 100644
--- a/erpnext/projects/desk_page/projects/projects.json
+++ b/erpnext/projects/desk_page/projects/projects.json
@@ -22,10 +22,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Projects",
- "modified": "2020-03-05 11:27:26.076716",
+ "modified": "2020-03-12 16:30:41.538685",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Projects",
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 3570a0f..5862963 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -18,7 +18,7 @@
 		};
 	},
 	onload: function (frm) {
-		var so = frappe.meta.get_docfield("Project", "sales_order");
+		var so = frm.get_docfield("Project", "sales_order");
 		so.get_route_options_for_new_doc = function (field) {
 			if (frm.is_new()) return;
 			return {
@@ -135,4 +135,4 @@
 		frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
 	});
 
-}
\ No newline at end of file
+}
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 794d816..f4b3d3e 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/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": [
   {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index fea2d5e..4397fe4 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -4,7 +4,7 @@
 erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 	setup: function() {
 		this._super();
-		frappe.flags.hide_serial_batch_dialog = false;
+		frappe.flags.hide_serial_batch_dialog = true;
 		frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
 			var item = frappe.get_doc(cdt, cdn);
 			var has_margin_field = frappe.meta.has_field(cdt, 'margin_type');
@@ -165,6 +165,16 @@
 				return (doc.rule_applied) ? "green" : "red";
 			});
 		}
+
+		let batch_no_field = this.frm.get_docfield("items", "batch_no");
+		if (batch_no_field) {
+			batch_no_field.get_route_options_for_new_doc = function(row) {
+				return {
+					"item": row.doc.item_code
+				}
+			};
+		}
+
 	},
 	onload: function() {
 		var me = this;
@@ -352,12 +362,17 @@
 
 				['serial_no', 'batch_no', 'barcode'].forEach(field => {
 					if (data[field] && frappe.meta.has_field(row_to_modify.doctype, field)) {
+
+						let value = (row_to_modify[field] && field === "serial_no")
+							? row_to_modify[field] + '\n' + data[field] : data[field];
+
 						frappe.model.set_value(row_to_modify.doctype,
-							row_to_modify.name, field, data[field]);
+							row_to_modify.name, field, value);
 					}
 				});
 
 				scan_barcode_field.set_value('');
+				refresh_field("items");
 			});
 		}
 		return false;
@@ -520,6 +535,15 @@
 								},
 								() => me.toggle_conversion_factor(item),
 								() => {
+									if (show_batch_dialog)
+										return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
+											.then((r) => {
+												if(r.message.has_batch_no || r.message.has_serial_no) {
+													frappe.flags.hide_serial_batch_dialog = false;
+												}
+											});
+								},
+								() => {
 									if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) {
 										var d = locals[cdt][cdn];
 										$.each(r.message, function(k, v) {
@@ -528,7 +552,9 @@
 
 										erpnext.show_serial_batch_selector(me.frm, d, (item) => {
 											me.frm.script_manager.trigger('qty', item.doctype, item.name);
-										});
+											if (!me.frm.doc.set_warehouse)
+												me.frm.script_manager.trigger('warehouse', item.doctype, item.name);
+										}, undefined, !frappe.flags.hide_serial_batch_dialog);
 									}
 								},
 								() => me.conversion_factor(doc, cdt, cdn, true),
diff --git a/erpnext/public/js/utils/dimension_tree_filter.js b/erpnext/public/js/utils/dimension_tree_filter.js
index 8b6de0f..75c5a82 100644
--- a/erpnext/public/js/utils/dimension_tree_filter.js
+++ b/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 @@
 							"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)) {
-				erpnext.dimension_filters.forEach((dimension) => {
-					if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
-						frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
-					}
-				});
+			if(frm.doc.company && (Object.keys(default_dimensions || {}).length > 0)
+				&& default_dimensions[frm.doc.company]) {
+				frm.trigger('update_dimension');
 			}
 		},
+
+		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 @@
 			});
 		},
 
-		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);
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index a240e49..d75633e 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -5,14 +5,13 @@
 		this.show_dialog = show_dialog;
 		// frm, item, warehouse_details, has_batch, oldest
 		let d = this.item;
-		if (d && d.has_batch_no && (!d.batch_no || this.show_dialog)) {
-			this.has_batch = 1;
-			this.setup();
+		this.has_batch = 0; this.has_serial_no = 0;
+
+		if (d && d.has_batch_no && (!d.batch_no || this.show_dialog)) this.has_batch = 1;
 		// !(this.show_dialog == false) ensures that show_dialog is implictly true, even when undefined
-		} else if(d && d.has_serial_no && !(this.show_dialog == false)) {
-			this.has_batch = 0;
-			this.setup();
-		}
+		if(d && d.has_serial_no && !(this.show_dialog == false)) this.has_serial_no = 1;
+
+		this.setup();
 	},
 
 	setup: function() {
@@ -36,16 +35,16 @@
 				label: __('Item Code'),
 				default: me.item_code
 			},
-			{fieldtype:'Column Break'},
 			{
 				fieldname: 'warehouse',
 				fieldtype:'Link',
 				options: 'Warehouse',
+				reqd: me.has_batch && !me.has_serial_no ? 0 : 1,
 				label: __(me.warehouse_details.type),
-				default: me.warehouse_details.name,
+				default: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
 				onchange: function(e) {
 
-					if(me.has_batch) {
+					if(me.has_batch && !me.has_serial_no) {
 						fields = fields.concat(me.get_batch_fields());
 					} else {
 						fields = fields.concat(me.get_serial_no_fields());
@@ -74,15 +73,16 @@
 			{
 				fieldname: 'qty',
 				fieldtype:'Float',
-				read_only: me.has_batch,
-				label: __(me.has_batch ? 'Total Qty' : 'Qty'),
+				read_only: me.has_batch && !me.has_serial_no,
+				label: __(me.has_batch && !me.has_serial_no ? 'Total Qty' : 'Qty'),
 				default: 0
 			},
 			{
 				fieldname: 'auto_fetch_button',
 				fieldtype:'Button',
-				hidden: me.has_batch,
-				label: __('Fetch based on FIFO'),
+				hidden: me.has_batch && !me.has_serial_no,
+				label: __('Auto Fetch'),
+				description: __('Fetch Serial Numbers based on FIFO'),
 				click: () => {
 					let qty = this.dialog.fields_dict.qty.get_value();
 					let numbers = frappe.call({
@@ -90,7 +90,7 @@
 						args: {
 							qty: qty,
 							item_code: me.item_code,
-							warehouse: me.warehouse_details.name,
+							warehouse: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
 							batch_no: me.item.batch_no || null
 						}
 					});
@@ -109,10 +109,12 @@
 			}
 		];
 
-		if (this.has_batch) {
+		if (this.has_batch && !this.has_serial_no) {
 			title = __("Select Batch Numbers");
 			fields = fields.concat(this.get_batch_fields());
 		} else {
+			// if only serial no OR
+			// if both batch_no & serial_no then only select serial_no and auto set batches nos
 			title = __("Select Serial Numbers");
 			fields = fields.concat(this.get_serial_no_fields());
 		}
@@ -122,25 +124,31 @@
 			fields: fields
 		});
 
-		if (this.item.serial_no) {
-			this.dialog.fields_dict.serial_no.set_value(this.item.serial_no);
-		}
-
 		this.dialog.set_primary_action(__('Insert'), function() {
 			me.values = me.dialog.get_values();
 			if(me.validate()) {
-				me.set_items();
-				me.dialog.hide();
+				frappe.run_serially([
+					() => me.update_batch_items(),
+					() => me.update_serial_no_item(),
+					() => me.update_batch_serial_no_items(),
+					() => {
+						refresh_field("items");
+						if (me.callback) {
+							return me.callback(me.item);
+						}
+					},
+					() => me.dialog.hide()
+				])
 			}
 		});
 
 		if(this.show_dialog) {
 			let d = this.item;
-			if (d.has_serial_no && d.serial_no) {
-				this.dialog.set_value('serial_no', d.serial_no);
+			if (this.item.serial_no) {
+				this.dialog.fields_dict.serial_no.set_value(this.item.serial_no);
 			}
-
-			if (d.has_batch_no && d.batch_no) {
+			
+			if (this.has_batch && !this.has_serial_no && d.batch_no) {
 				this.frm.doc.items.forEach(data => {
 					if(data.item_code == d.item_code) {
 						this.dialog.fields_dict.batches.df.data.push({
@@ -155,7 +163,7 @@
 			}
 		}
 
-		if (this.has_batch) {
+		if (this.has_batch && !this.has_serial_no) {
 			this.update_total_qty();
 		}
 
@@ -174,7 +182,7 @@
 			frappe.throw(__("Please select a warehouse"));
 			return false;
 		}
-		if(this.has_batch) {
+		if(this.has_batch && !this.has_serial_no) {
 			if(values.batches.length === 0 || !values.batches) {
 				frappe.throw(__("Please select batches for batched item "
 					+ values.item_code));
@@ -193,34 +201,23 @@
 		} else {
 			let serial_nos = values.serial_no || '';
 			if (!serial_nos || !serial_nos.replace(/\s/g, '').length) {
-				if (!this.show_dialog) {
-					frappe.throw(__("Please enter serial numbers for serialized item "
-						+ values.item_code));
-					return false;
-				}
+				frappe.throw(__("Please enter serial numbers for serialized item "
+					+ values.item_code));
+				return false;
 			}
 			return true;
 		}
 	},
 
-	set_items: function() {
-		var me = this;
-		if(this.has_batch) {
+	update_batch_items() {
+		// clones an items if muliple batches are selected.
+		if(this.has_batch && !this.has_serial_no) {
 			this.values.batches.map((batch, i) => {
 				let batch_no = batch.batch_no;
 				let row = '';
 
 				if (i !== 0 && !this.batch_exists(batch_no)) {
-					row = this.frm.add_child("items", {
-						'item_code': this.item.item_code,
-						'item_name': this.item.item_name,
-						'price_list_rate': this.item.price_list_rate,
-						'rate': this.item.rate,
-						'qty': batch.selected_qty,
-						'batch_no': batch_no,
-						'actual_qty': this.item.actual_qty,
-						'discount_percentage': this.item.discount_percentage
-					});
+					row = this.frm.add_child("items", { ...this.item });
 				} else {
 					row = this.frm.doc.items.find(i => i.batch_no === batch_no);
 				}
@@ -228,16 +225,59 @@
 				if (!row) {
 					row = this.item;
 				}
-
+				// this ensures that qty & batch no is set
 				this.map_row_values(row, batch, 'batch_no',
 					'selected_qty', this.values.warehouse);
 			});
-		} else {
+		} 
+	},
+
+	update_serial_no_item() {
+		// just updates serial no for the item
+		if(this.has_serial_no && !this.has_batch) {
 			this.map_row_values(this.item, this.values, 'serial_no', 'qty');
 		}
+	},
 
-		refresh_field("items");
-		this.callback && this.callback(this.item);
+	update_batch_serial_no_items() {
+		// if serial no selected is from different batches, adds new rows for each batch.
+		if(this.has_batch && this.has_serial_no) {
+			const selected_serial_nos = this.values.serial_no.split(/\n/g).filter(s => s);
+
+			return frappe.db.get_list("Serial No", {
+				filters: { 'name': ["in", selected_serial_nos]},
+				fields: ["batch_no", "name"]
+			}).then((data) => {
+				// data = [{batch_no: 'batch-1', name: "SR-001"}, 
+				// 	{batch_no: 'batch-2', name: "SR-003"}, {batch_no: 'batch-2', name: "SR-004"}]
+				const batch_serial_map = data.reduce((acc, d) => {
+					if (!acc[d['batch_no']]) acc[d['batch_no']] = [];
+					acc[d['batch_no']].push(d['name'])
+					return acc
+				}, {})
+				// batch_serial_map = { "batch-1": ['SR-001'], "batch-2": ["SR-003", "SR-004"]}
+				Object.keys(batch_serial_map).map((batch_no, i) => {
+					let row = '';
+					const serial_no = batch_serial_map[batch_no];
+					if (i == 0) {
+						row = this.item;
+						this.map_row_values(row, {qty: serial_no.length, batch_no: batch_no}, 'batch_no',
+							'qty', this.values.warehouse);
+					} else if (!this.batch_exists(batch_no)) {
+						row = this.frm.add_child("items", { ...this.item });
+						row.batch_no = batch_no;
+					} else {
+						row = this.frm.doc.items.find(i => i.batch_no === batch_no);
+					}
+					const values = {
+						'qty': serial_no.length,
+						'serial_no': serial_no.join('\n')
+					}
+					this.map_row_values(row, values, 'serial_no',
+						'qty', this.values.warehouse);
+				});
+			})
+		}
 	},
 
 	batch_exists: function(batch) {
@@ -287,7 +327,7 @@
 							return {
 								filters: {
 									item_code: me.item_code,
-									warehouse: me.warehouse || me.warehouse_details.name
+									warehouse: me.warehouse || typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : ''
 								},
 								query: 'erpnext.controllers.queries.get_batch_no'
 							};
@@ -313,11 +353,15 @@
 								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
 									},
@@ -444,7 +488,7 @@
 			{
 				fieldname: 'serial_no',
 				fieldtype: 'Small Text',
-				label: __(me.has_batch ? 'Selected Batch Numbers' : 'Selected Serial Numbers'),
+				label: __(me.has_batch && !me.has_serial_no ? 'Selected Batch Numbers' : 'Selected Serial Numbers'),
 				onchange: function() {
 					me.serial_list = this.get_value()
 						.replace(/\n/g, ' ').match(/\S+/g) || [];
diff --git a/erpnext/quality_management/desk_page/quality/quality.json b/erpnext/quality_management/desk_page/quality/quality.json
index 06ec869..5193e0c 100644
--- a/erpnext/quality_management/desk_page/quality/quality.json
+++ b/erpnext/quality_management/desk_page/quality/quality.json
@@ -24,10 +24,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Quality",
- "modified": "2020-03-05 11:27:25.890813",
+ "modified": "2020-03-12 16:30:39.093081",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality",
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
index 472b751..6df116c 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
+++ b/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": [
   {
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index f37b0e4..0282382 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -478,7 +478,7 @@
 			`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):
diff --git a/erpnext/regional/report/datev/datev.js b/erpnext/regional/report/datev/datev.js
index 1e000b6..d8638ab 100644
--- a/erpnext/regional/report/datev/datev.js
+++ b/erpnext/regional/report/datev/datev.js
@@ -21,6 +21,12 @@
 			"default": frappe.datetime.now_date(),
 			"fieldtype": "Date",
 			"reqd": 1
+		},
+		{
+			"fieldname": "voucher_type",
+			"label": __("Voucher Type"),
+			"fieldtype": "Select",
+			"options": "\nSales Invoice\nPurchase Invoice\nPayment Entry\nExpense Claim\nPayroll Entry\nBank Reconciliation\nAsset\nStock Entry"
 		}
 	],
 	onload: function(query_report) {
diff --git a/erpnext/regional/report/datev/datev.py b/erpnext/regional/report/datev/datev.py
index 7ceaf50..a657912 100644
--- a/erpnext/regional/report/datev/datev.py
+++ b/erpnext/regional/report/datev/datev.py
@@ -62,6 +62,7 @@
 	filters -- dict of filters to be passed to the sql query
 	as_dict -- return as list of dicts [0,1]
 	"""
+	filter_by_voucher = 'AND gl.voucher_type = %(voucher_type)s' if filters.get('voucher_type') else ''
 	gl_entries = frappe.db.sql("""
 		SELECT
 
@@ -80,8 +81,10 @@
 			gl.posting_date as 'Belegdatum',
 			gl.voucher_no as 'Belegfeld 1',
 			gl.remarks as 'Buchungstext',
-			gl.against_voucher_type as 'Beleginfo - Art 1',
-			gl.against_voucher as 'Beleginfo - Inhalt 1'
+			gl.voucher_type as 'Beleginfo - Art 1',
+			gl.voucher_no as 'Beleginfo - Inhalt 1',
+			gl.against_voucher_type as 'Beleginfo - Art 2',
+			gl.against_voucher as 'Beleginfo - Inhalt 2'
 
 		FROM `tabGL Entry` gl
 
@@ -109,7 +112,8 @@
 		WHERE gl.company = %(company)s 
 		AND DATE(gl.posting_date) >= %(from_date)s
 		AND DATE(gl.posting_date) <= %(to_date)s
-		ORDER BY 'Belegdatum', gl.voucher_no""", filters, as_dict=as_dict, as_utf8=1)
+		{}
+		ORDER BY 'Belegdatum', gl.voucher_no""".format(filter_by_voucher), filters, as_dict=as_dict)
 
 	return gl_entries
 
@@ -160,7 +164,7 @@
 			and ccl.company = par.company
 
 		WHERE par.company = %(company)s
-		AND par.parenttype = 'Customer'""", filters, as_dict=1, as_utf8=1)
+		AND par.parenttype = 'Customer'""", filters, as_dict=1)
 
 
 def get_suppliers(filters):
@@ -217,7 +221,7 @@
 			and con.is_primary_contact = '1'
 
 		WHERE par.company = %(company)s
-		AND par.parenttype = 'Supplier'""", filters, as_dict=1, as_utf8=1)
+		AND par.parenttype = 'Supplier'""", filters, as_dict=1)
 
 
 def get_account_names(filters):
@@ -281,24 +285,24 @@
 
 def get_header(filters, csv_class):
 	coa = frappe.get_value("Company", filters.get("company"), "chart_of_accounts")
-	coa_used = "SKR04" if "SKR04" in coa else ("SKR03" if "SKR03" in coa else "")
+	coa_used = "04" if "SKR04" in coa else ("03" if "SKR03" in coa else "")
 
 	header = [
 		# DATEV format
-		#   "DTVF" = created by DATEV software,
-		#   "EXTF" = created by other software
+		#	"DTVF" = created by DATEV software,
+		#	"EXTF" = created by other software
 		'"EXTF"',
 		# version of the DATEV format
-		#   141 = 1.41, 
-		#   510 = 5.10,
-		#   720 = 7.20
+		#	141 = 1.41, 
+		#	510 = 5.10,
+		#	720 = 7.20
 		'700',
 		csv_class.DATA_CATEGORY,
 		'"%s"' % csv_class.FORMAT_NAME,
 		# Format version (regarding format name)
 		csv_class.FORMAT_VERSION,
 		# Generated on
-		datetime.datetime.now().strftime("%Y%m%d%H%M%S"),
+		datetime.datetime.now().strftime("%Y%m%d%H%M%S") + '000',
 		# Imported on -- stays empty
 		'',
 		# Origin. Any two symbols, will be replaced by "SV" on import.
@@ -328,13 +332,21 @@
 		# R = Diktatkürzel
 		'',
 		# S = Buchungstyp
-		#   1 = Transaction batch (Finanzbuchführung),
-		#   2 = Annual financial statement (Jahresabschluss)
+		#	1 = Transaction batch (Finanzbuchführung),
+		#	2 = Annual financial statement (Jahresabschluss)
 		'1' if csv_class.DATA_CATEGORY == DataCategory.TRANSACTIONS else '',
 		# T = Rechnungslegungszweck
-		'',
+		#	0 oder leer = vom Rechnungslegungszweck unabhängig
+		#	50 = Handelsrecht
+		#	30 = Steuerrecht
+		#	64 = IFRS
+		#	40 = Kalkulatorik
+		#	11 = Reserviert
+		#	12 = Reserviert
+		'0',
 		# U = Festschreibung
-		'',
+		# TODO: Filter by Accounting Period. In export for closed Accounting Period, this will be "1"
+		'0',
 		# V = Default currency, for example, "EUR"
 		'"%s"' % frappe.get_value("Company", filters.get("company"), "default_currency"),
 		# reserviert
diff --git a/erpnext/regional/report/datev/datev_constants.py b/erpnext/regional/report/datev/datev_constants.py
index a4cd5fc..a059ed3 100644
--- a/erpnext/regional/report/datev/datev_constants.py
+++ b/erpnext/regional/report/datev/datev_constants.py
@@ -498,13 +498,27 @@
 	},
 	{
 		"label": "Beleginfo - Art 1",
-		"fieldname": "Beleginfo - Art 2",
-		"fieldtype": "Data",
+		"fieldname": "Beleginfo - Art 1",
+		"fieldtype": "Link",
+		"options": "DocType"
 	},
 	{
 		"label": "Beleginfo - Inhalt 1",
+		"fieldname": "Beleginfo - Inhalt 1",
+		"fieldtype": "Dynamic Link",
+		"options": "Beleginfo - Art 1"
+	},
+	{
+		"label": "Beleginfo - Art 2",
+		"fieldname": "Beleginfo - Art 2",
+		"fieldtype": "Link",
+		"options": "DocType"
+	},
+	{
+		"label": "Beleginfo - Inhalt 2",
 		"fieldname": "Beleginfo - Inhalt 2",
-		"fieldtype": "Data",
+		"fieldtype": "Dynamic Link",
+		"options": "Beleginfo - Art 2"
 	}
 ]
 
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 2c5ab7c..fd1cc58 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -54,8 +54,8 @@
 		return self.columns, self.data
 
 	def get_data(self):
-		if self.filters.get("type_of_business") ==  "B2C Small":
-			self.get_b2cs_data()
+		if self.filters.get("type_of_business") in  ("B2C Small", "B2C Large"):
+			self.get_b2c_data()
 		else:
 			for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
 				invoice_details = self.invoices.get(inv)
@@ -69,7 +69,7 @@
 					if taxable_value:
 						self.data.append(row)
 
-	def get_b2cs_data(self):
+	def get_b2c_data(self):
 		b2cs_output = {}
 
 		for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
@@ -84,7 +84,10 @@
 					"rate": "",
 					"taxable_value": 0,
 					"cess_amount": 0,
-					"type": ""
+					"type": "",
+					"invoice_number": invoice_details.get("invoice_number"),
+					"posting_date": invoice_details.get("posting_date"),
+					"invoice_value": invoice_details.get("base_grand_total"),
 				})
 
 				row = b2cs_output.get((rate, place_of_supply, ecommerce_gstin))
@@ -164,7 +167,7 @@
 				frappe.throw(_("Please set B2C Limit in GST Settings."))
 
 		if self.filters.get("type_of_business") ==  "B2C Large":
-			conditions += """ and SUBSTR(place_of_supply, 1, 2) != SUBSTR(company_gstin, 1, 2)
+			conditions += """ and ifnull(SUBSTR(place_of_supply, 1, 2),'') != ifnull(SUBSTR(company_gstin, 1, 2),'')
 				and grand_total > {0} and is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit))
 
 		elif self.filters.get("type_of_business") ==  "B2C Small":
@@ -581,6 +584,11 @@
 		if not gst_in: continue
 
 		for number, invoice in iteritems(res[gst_in]):
+			if not invoice[0]["place_of_supply"]:
+				frappe.throw(_("""{0} not entered in Invoice {1}.
+					Please update and try again""").format(frappe.bold("Place Of Supply"),
+					frappe.bold(invoice[0]['invoice_number'])))
+
 			inv_item = get_basic_invoice_detail(invoice[0])
 			inv_item["pos"] = "%02d" % int(invoice[0]["place_of_supply"].split('-')[0])
 			inv_item["rchrg"] = invoice[0]["reverse_charge"]
@@ -606,6 +614,9 @@
 
 	out = []
 	for d in data:
+		if not d.get("place_of_supply"):
+			frappe.throw(_("""{0} not entered in some invoices.
+				Please update and try again""").format(frappe.bold("Place Of Supply")))
 
 		pos = d.get('place_of_supply').split('-')[0]
 		tax_details = {}
@@ -642,6 +653,10 @@
 def get_b2cl_json(res, gstin):
 	out = []
 	for pos in res:
+		if not pos:
+			frappe.throw(_("""{0} not entered in some invoices.
+				Please update and try again""").format(frappe.bold("Place Of Supply")))
+
 		b2cl_item, inv = {"pos": "%02d" % int(pos.split('-')[0]), "inv": []}, []
 
 		for row in res[pos]:
diff --git a/erpnext/selling/desk_page/retail/retail.json b/erpnext/selling/desk_page/retail/retail.json
index db726d7..9838462 100644
--- a/erpnext/selling/desk_page/retail/retail.json
+++ b/erpnext/selling/desk_page/retail/retail.json
@@ -12,9 +12,11 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "idx": 0,
+ "is_standard": 1,
  "label": "Retail",
- "modified": "2020-03-05 11:27:25.602834",
+ "modified": "2020-03-12 16:30:36.154297",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Retail",
diff --git a/erpnext/selling/desk_page/selling/selling.json b/erpnext/selling/desk_page/selling/selling.json
index 1e7e029..7a0111c 100644
--- a/erpnext/selling/desk_page/selling/selling.json
+++ b/erpnext/selling/desk_page/selling/selling.json
@@ -38,10 +38,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Selling",
- "modified": "2020-03-05 11:27:25.835953",
+ "modified": "2020-03-12 16:30:38.207013",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Selling",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 9261289..02667e8 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -76,7 +76,8 @@
 	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()
@@ -267,9 +268,11 @@
 	target_doc.run_method("set_other_charges")
 	target_doc.run_method("calculate_taxes_and_totals")
 
-	price_list = frappe.get_value("Customer", source_name, 'default_price_list')
+	price_list, currency = frappe.db.get_value("Customer", {'name': source_name}, ['default_price_list', 'default_currency'])
 	if price_list:
 		target_doc.selling_price_list = price_list
+	if currency:
+		target_doc.currency = currency
 
 	return target_doc
 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index fa765df..61aa608 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -664,7 +664,8 @@
 						reference_doctype: me.frm.doctype,
 						reference_name: me.frm.docname,
 						content: __('Reason for hold: ')+data.reason_for_hold,
-						comment_email: frappe.session.user
+						comment_email: frappe.session.user,
+						comment_by: frappe.session.user_fullname
 					},
 					callback: function(r) {
 						if(!r.exc) {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index e7cbf40..13d2b15 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -641,7 +641,6 @@
 			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")
diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
index 1fc3663..405004e 100644
--- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
+++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
@@ -121,8 +121,8 @@
 		},
 		{
 			"label": _("Billed Amount"),
-			"fieldname": "rate",
-			"options": "billed_amount",
+			"fieldtype": "currency",
+			"fieldname": "billed_amount",
 			"width": 120
 		},
 		{
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 8278745..af10069 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -413,15 +413,20 @@
 	*/
 	set_batch_number: function(cdt, cdn) {
 		const doc = frappe.get_doc(cdt, cdn);
-		if (doc && doc.has_batch_no) {
+		if (doc && doc.has_batch_no && doc.warehouse) {
 			this._set_batch_number(doc);
 		}
 	},
 
 	_set_batch_number: function(doc) {
+		let args = {'item_code': doc.item_code, 'warehouse': doc.warehouse, 'qty': flt(doc.qty) * flt(doc.conversion_factor)};
+		if (doc.has_serial_no && doc.serial_no) {
+			args['serial_no'] = doc.serial_no
+		}
+		
 		return frappe.call({
 			method: 'erpnext.stock.doctype.batch.batch.get_batch_no',
-			args: {'item_code': doc.item_code, 'warehouse': doc.warehouse, 'qty': flt(doc.qty) * flt(doc.conversion_factor)},
+			args: args,
 			callback: function(r) {
 				if(r.message) {
 					frappe.model.set_value(doc.doctype, doc.name, 'batch_no', r.message);
diff --git a/erpnext/setup/desk_page/erpnext_settings/erpnext_settings.json b/erpnext/setup/desk_page/erpnext_settings/erpnext_settings.json
new file mode 100644
index 0000000..ac0a4b2
--- /dev/null
+++ b/erpnext/setup/desk_page/erpnext_settings/erpnext_settings.json
@@ -0,0 +1,112 @@
+{
+ "cards": [],
+ "category": "Modules",
+ "charts": [],
+ "creation": "2020-03-12 14:47:51.166455",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends": "Settings",
+ "extends_another_page": 1,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "ERPNext Settings",
+ "modified": "2020-03-12 18:03:17.126782",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "ERPNext Settings",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": [
+  {
+   "icon": "octicon octicon-rocket",
+   "is_query_report": 0,
+   "link_to": "Projects Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-repo",
+   "is_query_report": 0,
+   "link_to": "Accounts Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-package",
+   "is_query_report": 0,
+   "link_to": "Stock Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-organization",
+   "is_query_report": 0,
+   "link_to": "HR Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-tag",
+   "is_query_report": 0,
+   "link_to": "Selling Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-briefcase",
+   "is_query_report": 0,
+   "link_to": "Buying Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "fa fa-life-ring",
+   "is_query_report": 0,
+   "link_to": "Support Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "fa fa-shopping-cart",
+   "is_query_report": 0,
+   "link_to": "Shopping Cart Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "fa fa-globe",
+   "is_query_report": 0,
+   "link_to": "Portal Settings",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-tools",
+   "is_query_report": 0,
+   "link_to": "Manufacturing Settings",
+   "restrict_to_domain": "Manufacturing",
+   "type": "DocType"
+  },
+  {
+   "icon": "octicon octicon-mortar-board",
+   "is_query_report": 0,
+   "link_to": "Education Settings",
+   "restrict_to_domain": "Education",
+   "type": "DocType"
+  },
+  {
+   "icon": "fa fa-bed",
+   "is_query_report": 0,
+   "link_to": "Hotel Settings",
+   "restrict_to_domain": "Hospitality",
+   "type": "DocType"
+  },
+  {
+   "icon": "fa fa-heartbeat",
+   "is_query_report": 0,
+   "link_to": "Healthcare Settings",
+   "restrict_to_domain": "Healthcare",
+   "type": "DocType"
+  },
+  {
+   "icon": "fa fa-cog",
+   "is_query_report": 0,
+   "link_to": "Domain Settings",
+   "type": "DocType"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/setup/desk_page/getting_started/getting_started.json b/erpnext/setup/desk_page/getting_started/getting_started.json
index d67da62..b045b5d 100644
--- a/erpnext/setup/desk_page/getting_started/getting_started.json
+++ b/erpnext/setup/desk_page/getting_started/getting_started.json
@@ -41,8 +41,7 @@
  "charts": [
   {
    "chart_name": "Bank Balance",
-   "label": "All Your Money",
-   "size": "Full"
+   "label": "Bank Balance"
   }
  ],
  "creation": "2020-01-23 13:46:38.833076",
@@ -50,10 +49,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Getting Started",
- "modified": "2020-03-05 11:27:25.800189",
+ "modified": "2020-03-23 11:20:49.161823",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Getting Started",
@@ -80,6 +81,16 @@
    "is_query_report": 0,
    "link_to": "Sales Invoice",
    "type": "DocType"
+  },
+  {
+   "is_query_report": 0,
+   "link_to": "dashboard",
+   "type": "Page"
+  },
+  {
+   "is_query_report": 0,
+   "link_to": "leaderboard",
+   "type": "Page"
   }
  ]
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index dd602ec..020a93f 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:company_name",
@@ -156,6 +157,7 @@
   {
    "fieldname": "parent_company",
    "fieldtype": "Link",
+   "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Parent Company",
    "options": "Company"
@@ -276,6 +278,7 @@
    "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
    "fieldname": "existing_company",
    "fieldtype": "Link",
+   "ignore_user_permissions": 1,
    "label": "Existing Company ",
    "no_copy": 1,
    "options": "Company"
@@ -725,10 +728,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-21 18:09:53.534211",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
+ "nsm_parent_field": "parent_company",
  "owner": "Administrator",
  "permissions": [
   {
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index af30abd..b37cc17 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -9,7 +9,7 @@
 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')
 
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 7fa242a..10f9bd0 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/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": [
   {
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 36e3e68..004421d 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/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": [
   {
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index b05365d..e526ac4 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/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": [
   {
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.json b/erpnext/setup/doctype/supplier_group/supplier_group.json
index 5c41334..9119bb9 100644
--- a/erpnext/setup/doctype/supplier_group/supplier_group.json
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.json
@@ -1,481 +1,163 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
+ "actions": [],
  "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,
-   "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
+   "options": "Supplier Group"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "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",
-   "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
+   "label": "Is Group"
   },
   {
-   "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,
-   "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
+   "label": "Credit Limit"
   },
   {
-   "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,
-   "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
+   "options": "Payment Terms Template"
   },
   {
-   "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,
-   "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
+   "label": "Default Payable Account"
   },
   {
-   "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,
-   "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
+   "options": "Party Account"
   },
   {
-   "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,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "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,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "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,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "report_hide": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-flag",
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-08-29 06:25:57.589824",
+ "is_tree": 1,
+ "links": [],
+ "modified": "2020-03-18 18:10:49.228407",
  "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",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "Purchase Manager"
   },
   {
-   "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",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "Purchase User"
   },
   {
-   "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",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "Purchase Manager"
   },
   {
-   "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",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "Purchase User"
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ "sort_order": "ASC"
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index 91a3dda..aa8e048 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/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": [
   {
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 439e6a5..13269a8 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -142,6 +142,6 @@
 				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
diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py
index a4d4cbd..8d64efe 100644
--- a/erpnext/stock/__init__.py
+++ b/erpnext/stock/__init__.py
@@ -13,12 +13,16 @@
 ]
 
 def get_warehouse_account_map(company=None):
-	if not frappe.flags.warehouse_account_map or frappe.flags.in_test:
+	company_warehouse_account_map = company and frappe.flags.setdefault('warehouse_account_map', {}).get(company)
+	warehouse_account_map = frappe.flags.warehouse_account_map
+
+	if not warehouse_account_map or not company_warehouse_account_map or frappe.flags.in_test:
 		warehouse_account = frappe._dict()
 
 		filters = {}
 		if company:
 			filters['company'] = company
+			frappe.flags.setdefault('warehouse_account_map', {}).setdefault(company, {})
 
 		for d in frappe.get_all('Warehouse',
 			fields = ["name", "account", "parent_warehouse", "company", "is_group"],
@@ -30,10 +34,12 @@
 			if d.account:
 				d.account_currency = frappe.db.get_value('Account', d.account, 'account_currency', cache=True)
 				warehouse_account.setdefault(d.name, d)
-
-		frappe.flags.warehouse_account_map = warehouse_account
-
-	return frappe.flags.warehouse_account_map
+		if company:
+			frappe.flags.warehouse_account_map[company] = warehouse_account
+		else:
+			frappe.flags.warehouse_account_map = warehouse_account
+	
+	return frappe.flags.warehouse_account_map.get(company) or frappe.flags.warehouse_account_map
 
 def get_warehouse_account(warehouse, warehouse_account=None):
 	account = warehouse.account
diff --git a/erpnext/stock/desk_page/stock/stock.json b/erpnext/stock/desk_page/stock/stock.json
index 5786733..779e61f 100644
--- a/erpnext/stock/desk_page/stock/stock.json
+++ b/erpnext/stock/desk_page/stock/stock.json
@@ -44,10 +44,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Stock",
- "modified": "2020-03-05 11:27:25.950288",
+ "modified": "2020-03-12 16:30:39.881667",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock",
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 8ae978e..9b7249e 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -122,8 +122,11 @@
 			self.expiry_date = add_days(self.manufacturing_date, shelf_life_in_days)
 
 		if has_expiry_date and not self.expiry_date:
-			frappe.msgprint(_('Expiry date is mandatory for selected item.'))
-			frappe.throw(_("Set item's shelf life in days, to set expiry based on manufacturing date plus shelf-life."))
+			frappe.throw(msg=_("Please set {0} for Batched Item {1}, which is used to set {2} on Submit.") \
+				.format(frappe.bold("Shelf Life in Days"),
+					frappe.utils.get_link_to_form("Item", self.item),
+					frappe.bold("Batch Expiry Date")),
+				title=_("Expiry Date Mandatory"))
 
 	def get_name_from_naming_series(self):
 		"""
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 97a8472..73b36e3 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -69,15 +69,21 @@
 		'''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)
-			from `tabWork Order` pro, `tabWork Order Item` item
-			where
+			SELECT
+				CASE WHEN ifnull(skip_transfer, 0) = 0 THEN
+					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()
 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index ea94c7b..30d82ca 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -414,7 +414,6 @@
 	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")
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index a34db45..28e9533 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -238,7 +238,7 @@
 		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
 
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 3503e7c..aa6b2fe 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -343,7 +343,8 @@
   {
    "fieldname": "shelf_life_in_days",
    "fieldtype": "Int",
-   "label": "Shelf Life In Days"
+   "label": "Shelf Life In Days",
+   "mandatory_depends_on": "eval:doc.has_batch_no && doc.has_expiry_date"
   },
   {
    "default": "2099-12-31",
@@ -1045,7 +1046,7 @@
  "image_field": "image",
  "links": [],
  "max_attachments": 1,
- "modified": "2020-01-02 19:13:59.295963",
+ "modified": "2020-03-24 16:14:36.950677",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 74ae627..e2e84c4 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -183,12 +183,17 @@
 		# 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_value('Warehouse', {'warehouse_name': _('Stores')}))
+					or frappe.db.get_single_value('Stock Settings', 'default_warehouse'))
+			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"))
 
@@ -736,14 +741,12 @@
 				defaults = frappe.defaults.get_defaults() or {}
 
 				# To check default warehouse is belong to the default company
-				if defaults.get("default_warehouse") and frappe.db.exists("Warehouse",
+				if defaults.get("default_warehouse") and defaults.company and frappe.db.exists("Warehouse",
 					{'name': defaults.default_warehouse, 'company': defaults.company}):
-					warehouse = defaults.default_warehouse
-
-				self.append("item_defaults", {
-					"company": defaults.get("company"),
-					"default_warehouse": warehouse
-				})
+						self.append("item_defaults", {
+							"company": defaults.get("company"),
+							"default_warehouse": defaults.default_warehouse
+						})
 
 	def update_variants(self):
 		if self.flags.dont_update_variants or \
diff --git a/erpnext/stock/doctype/item_alternative/item_alternative.py b/erpnext/stock/doctype/item_alternative/item_alternative.py
index b14683b..da0c3b7 100644
--- a/erpnext/stock/doctype/item_alternative/item_alternative.py
+++ b/erpnext/stock/doctype/item_alternative/item_alternative.py
@@ -22,6 +22,21 @@
 		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)}):
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index 7df40fb..5ad0e13 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -8,6 +8,7 @@
 from frappe.model.meta import get_field_precision
 from frappe.model.document import Document
 from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+from erpnext.accounts.doctype.account.account import get_account_currency
 
 class LandedCostVoucher(Document):
 	def get_items_from_purchase_receipts(self):
@@ -43,6 +44,7 @@
 		else:
 			self.validate_applicable_charges_for_item()
 		self.validate_purchase_receipts()
+		self.validate_expense_accounts()
 		self.set_total_taxes_and_charges()
 
 	def check_mandatory(self):
@@ -71,6 +73,14 @@
 				frappe.throw(_("Row {0}: Cost center is required for an item {1}")
 					.format(item.idx, item.item_code))
 
+	def validate_expense_accounts(self):
+		company_currency = erpnext.get_company_currency(self.company)
+		for account in self.taxes:
+			if get_account_currency(account.expense_account) != company_currency:
+				frappe.throw(msg=_(""" Row {0}: Expense account currency should be same as company's default currency.
+					Please select expense account with account currency as {1}""")
+					.format(account.idx, frappe.bold(company_currency)), title=_("Invalid Account Currency"))
+
 	def set_total_taxes_and_charges(self):
 		self.total_taxes_and_charges = sum([flt(d.amount) for d in self.get("taxes")])
 
@@ -104,7 +114,6 @@
 	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 +132,8 @@
 			# 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)
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index d80e8f2..cba7f20 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -53,7 +53,7 @@
 		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 @@
 			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 @@
 		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 @@
 		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)
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index a876d16..a8b9c81 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/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",
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 64d4c6c..772ac58 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -523,12 +523,15 @@
 	return serial_nos
 
 @frappe.whitelist()
-def auto_fetch_serial_number(qty, item_code, warehouse, batch_no=None):
-	serial_numbers = frappe.get_list("Serial No", filters={
+def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None):
+	import json
+	filters = {
 		"item_code": item_code,
 		"warehouse": warehouse,
-		"batch_no": batch_no,
 		"delivery_document_no": "",
 		"sales_invoice": ""
-	}, limit=qty, order_by="creation")
+	}
+	if batch_nos: filters["batch_no"] = ["in", json.loads(batch_nos)]
+
+	serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation")
 	return [item['name'] for item in serial_numbers]
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 170a80f..3bb9415 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -60,7 +60,8 @@
 					}
 				}
 
-				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
@@ -309,12 +310,12 @@
 			method: "erpnext.stock.get_item_details.get_serial_no",
 			args: {"args": args},
 			callback: function(r) {
-				if (!r.exe){
+				if (!r.exe && r.message){
 					frappe.model.set_value(cdt, cdn, "serial_no", r.message);
-				}
 
-				if (callback) {
-					callback();
+					if (callback) {
+						callback();
+					}
 				}
 			}
 		});
@@ -622,10 +623,15 @@
 					if(r.message) {
 						var d = locals[cdt][cdn];
 						$.each(r.message, function(k, v) {
-							frappe.model.set_value(cdt, cdn, k, v); // qty and it's subsequent fields weren't triggered
+							if (v) {
+								frappe.model.set_value(cdt, cdn, k, v); // qty and it's subsequent fields weren't triggered
+							}
 						});
 						refresh_field("items");
-						erpnext.stock.select_batch_and_serial_no(frm, d);
+
+						if (!d.serial_no) {
+							erpnext.stock.select_batch_and_serial_no(frm, d);
+						}
 					}
 				}
 			});
@@ -964,10 +970,8 @@
 		}
 	}
 
-	if(item && item.has_serial_no
-		&& frm.doc.purpose === 'Material Receipt') {
-		return;
-	}
+	if(item && !item.has_serial_no && !item.has_batch_no) return;
+	if (frm.doc.purpose === 'Material Receipt') return;
 
 	frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
 		new erpnext.SerialNoBatchSelector({
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 8b072c6..be4c78b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -177,6 +177,10 @@
 		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))
 
@@ -234,7 +238,7 @@
 		if self.purpose == "Manufacture" and self.work_order:
 			production_item = frappe.get_value('Work Order', self.work_order, 'production_item')
 			for item in self.items:
-				if item.item_code == production_item and item.qty != self.fg_completed_qty:
+				if item.item_code == production_item and item.t_warehouse and item.qty != self.fg_completed_qty:
 					frappe.throw(_("Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different")
 						.format(item.qty, self.fg_completed_qty))
 
@@ -294,13 +298,8 @@
 				if validate_for_manufacture:
 					if d.bom_no:
 						d.s_warehouse = None
-
 						if not d.t_warehouse:
 							frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx))
-
-						elif self.pro_doc and (cstr(d.t_warehouse) != self.pro_doc.fg_warehouse and cstr(d.t_warehouse) != self.pro_doc.scrap_warehouse):
-							frappe.throw(_("Target warehouse in row {0} must be same as Work Order").format(d.idx))
-
 					else:
 						d.t_warehouse = None
 						if not d.s_warehouse:
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index d86e68b..a848c80 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "hash",
  "creation": "2013-03-29 18:22:12",
  "doctype": "DocType",
@@ -479,8 +480,7 @@
    "fieldname": "project",
    "fieldtype": "Link",
    "label": "Project",
-   "options": "Project",
-   "read_only": 1
+   "options": "Project"
   },
   {
    "fieldname": "po_detail",
@@ -494,7 +494,8 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-08-20 14:01:02.319754",
+ "links": [],
+ "modified": "2020-03-19 12:34:09.836295",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry Detail",
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 2bf1ed8..5d534af 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/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": [
   {
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
index 3d5cfdc..9adfbf7 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.js
@@ -29,7 +29,13 @@
 			"fieldname":"warehouse",
 			"label": __("Warehouse"),
 			"fieldtype": "Link",
-			"options": "Warehouse"
+			"options": "Warehouse",
+			"get_query": function() {
+				const company = frappe.query_report.get_filter_value('company');
+				return { 
+					filters: { 'company': company }
+				}
+			}
 		},
 		{
 			"fieldname":"item_code",
diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
index 913d7d8..c8efb16 100644
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -44,7 +44,9 @@
 				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,
diff --git a/erpnext/support/desk_page/support/support.json b/erpnext/support/desk_page/support/support.json
index 8602567..4a7885e 100644
--- a/erpnext/support/desk_page/support/support.json
+++ b/erpnext/support/desk_page/support/support.json
@@ -34,10 +34,12 @@
  "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Desk Page",
+ "extends_another_page": 0,
  "icon": "",
  "idx": 0,
+ "is_standard": 1,
  "label": "Support",
- "modified": "2020-03-05 11:27:25.917497",
+ "modified": "2020-03-12 16:30:39.482621",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Support",
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index 9b904ad..0f15e47 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -18,7 +18,7 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2019-12-10 13:48:19.894186",
+ "modified": "2020-03-06 05:24:05.749664",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "issues",
@@ -58,7 +58,7 @@
    "options": "Open\nReplied\nHold\nClosed",
    "read_only": 1,
    "reqd": 0,
-   "show_in_filter": 0
+   "show_in_filter": 1
   },
   {
    "allow_read_on_all_link_options": 0,
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
index dfd3ed7..16ecd51 100644
--- a/erpnext/tests/utils.py
+++ b/erpnext/tests/utils.py
@@ -7,6 +7,8 @@
 
 def create_test_contact_and_address():
 	frappe.db.sql('delete from tabContact')
+	frappe.db.sql('delete from `tabContact Email`')
+	frappe.db.sql('delete from `tabContact Phone`')
 	frappe.db.sql('delete from tabAddress')
 	frappe.db.sql('delete from `tabDynamic Link`')
 
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 779306e..98b202f 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -168,12 +168,11 @@
 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 &#39;n logboek met dieselfde tydstempel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,rekenmeester
@@ -245,7 +244,6 @@
 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 &quot;Toelae vir oorfakturering&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; 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/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,&#39;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 &gt; Supplier Type,Verskaffer&gt; 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/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} -&gt; {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -&gt; {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: 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/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 &#39;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 &gt; Settings &gt; Naming Series,Stel Naming Series in vir {0} via Setup&gt; Settings&gt; 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/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 &gt; HR Settings,Stel asseblief &#39;n naamstelsel vir werknemers in vir mensehulpbronne&gt; 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/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 &gt; Numbering Series,Stel nommeringreekse op vir bywoning via Setup&gt; 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: 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 &gt; Education Settings,Stel asb. Die opvoeder-naamstelsel op in onderwys&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 9c6d63d..9402bdd 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -168,12 +168,11 @@
 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 @@
 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 @@
 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 &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም
 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/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 &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት
 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/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} -&gt; {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -&gt; {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: 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/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 &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንብሮች ውስጥ የሰራተኛ መለያ ስም መስሪያ ስርዓት ያዋቅሩ
 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/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 &gt; Numbering Series,እባክዎን ለተማሪ ተገኝነት በማዋቀር&gt; የቁጥር ተከታታይ በኩል ያዘጋጁ
 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: 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 &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ አስተማሪ ስም ማጎሪያ ስርዓት ያዋቅሩ
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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} የጊዜ ሰሌዳዎች መደቦች ተደራርበው, በተደጋጋሚ የተደባዙ ስሎዶች ከተዘለሉ በኋላ መቀጠል ይፈልጋሉ?"
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index f8f8466..b305fd9 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -168,12 +168,11 @@
 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 @@
 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.",للسماح بزيادة الفواتير ، حدّث &quot;Over Billing Allowance&quot; في إعدادات الحسابات أو العنصر.
 DocType: Patient Appointment,Procedure,إجراء
 DocType: Accounts Settings,Use Custom Cash Flow Format,استخدم تنسيق التدفق النقدي المخصص
@@ -981,7 +979,6 @@
 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 &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 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/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 &gt; Supplier Type,مورد&gt; نوع المورد
 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/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} -&gt; {1}) not found for item: {2},معامل تحويل UOM ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; سلسلة التسمية
 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/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 &gt; HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 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/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 &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 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: 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 &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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} ، هل تريد المتابعة بعد تخطي الفتحات المتراكبة؟
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 396c296..5cdac6f 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -168,12 +168,11 @@
 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 @@
 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 @@
 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 &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 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/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 &gt; Supplier Type,Доставчик&gt; Тип доставчик
 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/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} -&gt; {1}) not found for item: {2},Коефициент на конверсия на UOM ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка&gt; Настройки&gt; Наименуване на серия"
 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/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 &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 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/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 &gt; Numbering Series,"Моля, настройте номерацията на сериите за присъствие чрез настройка&gt; серия от номерация"
 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: 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 &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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}, искате ли да продължите, след като прескочите припокритите слотове?"
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 24f3fbe..f586e66 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -167,11 +167,10 @@
 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 @@
 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.",অতিরিক্ত বিলিংয়ের অনুমতি দেওয়ার জন্য অ্যাকাউন্টস সেটিংস বা আইটেমটিতে &quot;ওভার বিলিং ভাতা&quot; আপডেট করুন।
 DocType: Patient Appointment,Procedure,কার্যপ্রণালী
 DocType: Accounts Settings,Use Custom Cash Flow Format,কাস্টম ক্যাশ ফ্লো বিন্যাস ব্যবহার করুন
@@ -963,7 +961,6 @@
 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 &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 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/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 &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 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/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} -&gt; {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -&gt; {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: 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/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 &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 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/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 &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 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: 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 &gt; Education Settings,অনুগ্রহ করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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/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/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 @@
 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} ওভারল্যাপের জন্য সময়সূচী, আপনি কি ওভারল্যাপেড স্লটগুলি বাদ দিয়ে এগিয়ে যেতে চান?"
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 46afee3..5e3f53d 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -168,12 +168,11 @@
 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 @@
 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 @@
 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 &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; 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/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 &gt; Supplier Type,Dobavljač&gt; 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/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} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje&gt; Podešavanja&gt; 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/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 &gt; HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima&gt; 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/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 &gt; Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje&gt; 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: 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 &gt; Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 07116ab..e147d04 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -168,12 +168,11 @@
 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 @@
 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 &quot;Indemnització sobre facturació&quot; a la configuració del compte o a l&#39;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 @@
 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 &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup d&#39;elements&gt; 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/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,S&#39;ha produït un error durant el procés d&#39;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 &gt; Supplier Type,Proveïdor&gt; 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&#39;entrada
 DocType: Service Level Priority,Service Level Priority,Prioritat de nivell de servei
@@ -1438,7 +1434,6 @@
 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} -&gt; {1}) not found for item: {2},Factor de conversió UOM ({0} -&gt; {1}) no trobat per a l&#39;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&#39;intercanvi de divises ha de ser aplicable per a la compra o per a la venda.
@@ -1955,7 +1950,6 @@
 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&#39;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/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 &gt; Settings &gt; Naming Series,Configureu Naming Series per a {0} mitjançant Configuració&gt; Configuració&gt; 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/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 &gt; HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans&gt; 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&#39;amortització
@@ -4067,7 +4059,6 @@
 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 &gt; Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració&gt; 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&#39;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: 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 &gt; Education Settings,Configureu un sistema de nom de l’Instructor a Educació&gt; 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 @@
 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/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&#39;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&#39;actualitza per {0} de la llista de preus {1}
@@ -5556,8 +5545,6 @@
 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&#39;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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 9dd21a5..0a01dcd 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -168,12 +168,11 @@
 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 @@
 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 @@
 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 &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; 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/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 &gt; Supplier Type,Dodavatel&gt; 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/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} -&gt; {1}) not found for item: {2},UOM konverzní faktor ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Nastavte Naming Series pro {0} prostřednictvím Setup&gt; Settings&gt; 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/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 &gt; HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje&gt; 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/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 &gt; Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení&gt; Čí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: 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 &gt; Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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ů?"
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 8a54136..df6b6c5 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -168,12 +168,11 @@
 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 @@
 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 &quot;Over faktureringsgodtgørelse&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; 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/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 &gt; Supplier Type,Leverandør&gt; 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/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} -&gt; {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Angiv Naming Series for {0} via Setup&gt; Settings&gt; 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/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 &gt; HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource&gt; 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/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 &gt; Numbering Series,Indstil nummerserier til deltagelse via Opsætning&gt; 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: 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 &gt; Education Settings,Indstil instruktørens navngivningssystem i uddannelse&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 0d406dc..66b10ef 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -168,12 +168,11 @@
 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 @@
 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 &quot;Over Billing Allowance&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; 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/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 &gt; Supplier Type,Lieferant&gt; 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/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} -&gt; {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Bitte stellen Sie die Namensreihe über Setup&gt; Einstellungen&gt; 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/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 &gt; HR Settings,Bitte richten Sie das Employee Naming System unter Human Resource&gt; 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/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 &quot;Gerundete Summe&quot; 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 &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; 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: 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 &gt; Education Settings,Bitte richten Sie das Instructor Naming System unter Education&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index d8b5a0f..b63948a 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -168,12 +168,11 @@
 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 @@
 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.","Για να επιτρέψετε την υπερβολική τιμολόγηση, ενημερώστε την &quot;Over Allowance Billing&quot; στις Ρυθμίσεις Λογαριασμών ή στο Στοιχείο."
 DocType: Patient Appointment,Procedure,Διαδικασία
 DocType: Accounts Settings,Use Custom Cash Flow Format,Χρησιμοποιήστε την προσαρμοσμένη μορφή ροής μετρητών
@@ -981,7 +979,6 @@
 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 &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 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/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 &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 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/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} -&gt; {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; 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/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 &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις 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/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 &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 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: 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 &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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}, θέλετε να προχωρήσετε αφού παρακάμπτεστε τις επικαλυμμένες υποδοχές;"
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index d86a3ba..5e1bd42 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -168,12 +168,11 @@
 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 @@
 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 &quot;Asignación de facturación excesiva&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; 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/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 &gt; Supplier Type,Proveedor&gt; 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/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} -&gt; {1}) not found for item: {2},Factor de conversión de UOM ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Configure Naming Series para {0} a través de Configuración&gt; Configuración&gt; 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/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 &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; 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/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 &gt; Numbering Series,Configure la serie de numeración para la Asistencia a través de Configuración&gt; 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: 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 &gt; Education Settings,Configure el Sistema de nombres de instructores en Educación&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index f303ca4..a876b5c 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -166,12 +166,11 @@
 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 @@
 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 &quot;Üle arvelduse hüvitis&quot;.
 DocType: Patient Appointment,Procedure,Menetlus
 DocType: Accounts Settings,Use Custom Cash Flow Format,Kasutage kohandatud rahavoogude vormingut
@@ -976,7 +974,6 @@
 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 &gt; Item Group &gt; Brand,Kauba kood&gt; esemerühm&gt; 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/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 &gt; Supplier Type,Tarnija&gt; 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/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} -&gt; {1}) not found for item: {2},UOM teisendustegurit ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,"Valige Seadistamise seeria väärtuseks {0}, mis asub seadistuse&gt; Seadistused&gt; 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/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 &gt; HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist&gt; 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/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 &gt; Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise&gt; 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: 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 &gt; Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index bb47a6c..d51d2ca 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -167,11 +167,10 @@
 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 @@
 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.",برای اجازه بیش از صدور صورت حساب ، &quot;بیش از کمک هزینه صورتحساب&quot; را در تنظیمات حساب یا مورد به روز کنید.
 DocType: Patient Appointment,Procedure,روش
 DocType: Accounts Settings,Use Custom Cash Flow Format,از فرم سفارشی جریان جریان استفاده کنید
@@ -963,7 +961,6 @@
 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 &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 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/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 &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 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: 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/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 &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات 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/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 &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 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: 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 &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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/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/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 @@
 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} همپوشانی را دنبال می کنید، پس از لغو شکاف های پوشیدنی، می خواهید؟
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index c8eff03..e12875e 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -168,12 +168,11 @@
 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 @@
 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ä &quot;Yli laskutuskorvaus&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; 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/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 &gt; Supplier Type,Toimittaja&gt; 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/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} -&gt; {1}) not found for item: {2},UOM-muuntokerrointa ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset&gt; Asetukset&gt; 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/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 &gt; HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit&gt; 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/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 &gt; Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset&gt; 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: 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 &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohtaan Koulutus&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 4bb6eaac..974c4b1 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -168,12 +168,11 @@
 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&#39;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 @@
 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 &quot;Provision de facturation excédentaire&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Code article&gt; Groupe d&#39;articles&gt; 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/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Une erreur s&#39;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 &gt; Supplier Type,Fournisseur&gt; 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/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} -&gt; {1}) not found for item: {2},Facteur de conversion UdM ({0} -&gt; {1}) introuvable pour l&#39;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: 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&#39;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/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 &gt; Settings &gt; Naming Series,Veuillez définir la série de noms pour {0} via Configuration&gt; Paramètres&gt; 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/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 &gt; HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines&gt; 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/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&#39;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 &gt; Numbering Series,Veuillez configurer la série de numérotation pour l&#39;assistance via Configuration&gt; 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: 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 &gt; Education Settings,Veuillez configurer le système de dénomination de l&#39;instructeur dans Éducation&gt; Paramètres de l&#39;é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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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 ?"
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index dacd8ea..ea6724a 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -167,11 +167,10 @@
 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 @@
 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.","વધુ બિલિંગને મંજૂરી આપવા માટે, એકાઉન્ટ્સ સેટિંગ્સ અથવા આઇટમમાં &quot;ઓવર બિલિંગ એલાઉન્સ&quot; અપડેટ કરો."
 DocType: Patient Appointment,Procedure,કાર્યવાહી
 DocType: Accounts Settings,Use Custom Cash Flow Format,કસ્ટમ કેશ ફ્લો ફોર્મેટનો ઉપયોગ કરો
@@ -964,7 +962,6 @@
 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 &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 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/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 &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 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/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} -&gt; {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -&gt; {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: 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/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 &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 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/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 &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 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: 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 &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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/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/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 @@
 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} ઓવરલેપ માટે શેડ્યૂલ, શું તમે ઓવરલેપ કરેલ સ્લોટ્સને છોડીને આગળ વધવા માંગો છો?"
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index bfe968e..70e0546 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -2207,7 +2207,7 @@
 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 @@
 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,פרט היעד
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 4b6261d..d020cd3 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -166,12 +166,11 @@
 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 @@
 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.","बिलिंग की अनुमति देने के लिए, खाता सेटिंग या आइटम में &quot;ओवर बिलिंग बिलिंग भत्ता&quot; अपडेट करें।"
 DocType: Patient Appointment,Procedure,प्रक्रिया
 DocType: Accounts Settings,Use Custom Cash Flow Format,कस्टम कैश फ्लो प्रारूप का उपयोग करें
@@ -978,7 +976,6 @@
 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 &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 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/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 &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 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/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} -&gt; {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,कृपया सेटिंग&gt; सेटिंग&gt; नामकरण श्रृंखला के माध्यम से {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/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 &gt; HR Settings,कृपया मानव संसाधन&gt; 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/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 &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 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: 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 &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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} ओवरलैप के लिए अनुसूची, क्या आप ओवरलैप किए गए स्लॉट को छोड़ने के बाद आगे बढ़ना चाहते हैं?"
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 9b10315..af957a3 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -168,12 +168,11 @@
 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 @@
 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 &quot;Nadoplata za naplatu&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; 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/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 &gt; Supplier Type,Dobavljač&gt; 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/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} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {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: 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/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 &gt; Settings &gt; Naming Series,Postavite Nameing Series za {0} putem Postavke&gt; Postavke&gt; 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/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 &gt; HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi&gt; 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/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 &gt; Numbering Series,Postavite brojevnu seriju za Attendance putem Postavljanje&gt; 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: 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 &gt; Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 52088fe..5044c54 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -168,12 +168,11 @@
 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 @@
 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 &quot;Fiókbeállítások felett&quot; pontot a &quot;Túlfizetési támogatás&quot; 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 @@
 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 &gt; Item Group &gt; Brand,Cikkszám&gt; Tételcsoport&gt; 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/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 &gt; Supplier Type,Szállító&gt; 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/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} -&gt; {1}) not found for item: {2},UOM konverziós tényező ({0} -&gt; {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: 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/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 &gt; Settings &gt; 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&gt; Beállítások&gt; 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/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 &gt; HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás&gt; 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/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 &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás&gt; 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: 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 &gt; Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás&gt; 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 @@
 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/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 @@
 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: 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 @@
 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: 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 @@
 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 @@
 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/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 @@
 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?"
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index a27b0a7..0097cae 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Pekerjaan dalam proses
 DocType: Leave Control Panel,Branch (optional),Cabang (opsional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Silakan pilih tanggal
-DocType: Item Price,Minimum Qty ,Minimum Qty
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimum Qty
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekursi BOM: {0} tidak boleh anak dari {1}
 DocType: Finance Book,Finance Book,Buku Keuangan
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Daftar Hari Libur
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Akun induk {0} tidak ada
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Ulasan dan Aksi
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Karyawan ini sudah memiliki log dengan stempel waktu yang sama. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Akuntan
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Merugi
 DocType: Crop,Perennial,Abadi
 DocType: Program,Is Published,Diterbitkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Tampilkan Catatan Pengiriman
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Untuk memungkinkan tagihan berlebih, perbarui &quot;Kelebihan Tagihan Penagihan&quot; di Pengaturan Akun atau Item."
 DocType: Patient Appointment,Procedure,Prosedur
 DocType: Accounts Settings,Use Custom Cash Flow Format,Gunakan Format Arus Kas Khusus
@@ -981,7 +979,6 @@
 DocType: Patient,Risk Factors,Faktor risiko
 DocType: Patient,Occupational Hazards and Environmental Factors,Bahaya Kerja dan Faktor Lingkungan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entri Saham sudah dibuat untuk Perintah Kerja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Lihat pesanan sebelumnya
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} percakapan
 DocType: Vital Signs,Respiratory rate,Tingkat pernapasan
@@ -1139,7 +1136,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Kesalahan terjadi selama proses pembaruan
 DocType: Restaurant Reservation,Restaurant Reservation,Reservasi Restoran
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Barang Anda
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Penulisan Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Masuk Pengurangan
 DocType: Service Level Priority,Service Level Priority,Prioritas Tingkat Layanan
@@ -1438,7 +1434,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Silakan pilih Perusahaan dan Tanggal Posting untuk mendapatkan entri
 DocType: Asset,Maintenance,Pemeliharaan
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Dapatkan dari Pertemuan Pasien
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor Konversi UOM ({0} -&gt; {1}) tidak ditemukan untuk item: {2}
 DocType: Subscriber,Subscriber,Subscriber
 DocType: Item Attribute Value,Item Attribute Value,Nilai Item Atribut
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Pertukaran Mata Uang harus berlaku untuk Membeli atau untuk Penjualan.
@@ -1936,7 +1931,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Is Return (Debit Note)
 DocType: Workstation,Wages,Upah
 DocType: Asset Maintenance,Maintenance Manager Name,Nama Manajer Pemeliharaan
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaksi terhadap perusahaan sudah ada!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Situs yang Meminta
 DocType: Agriculture Task,Urgent,Mendesak
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Mengambil catatan ......
@@ -2634,7 +2628,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Syarat Pembayaran di baris {0} mungkin merupakan duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Pertanian (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Slip Packing
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tentukan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Sewa Kantor
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
 DocType: Disease,Common Name,Nama yang umum
@@ -2800,7 +2793,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},cuti Dialokasikan Berhasil untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Tidak ada item untuk dikemas
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Hanya file .csv dan .xlsx yang didukung saat ini
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan atur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
 DocType: Loan,Repayment Method,Metode pembayaran
@@ -4048,7 +4040,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Diperlukan pada
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Jika dicentang, sembunyikan dan nonaktifkan bidang Rounded Total dalam Slip Gaji"
 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.,Ini adalah offset default (hari) untuk Tanggal Pengiriman dalam Pesanan Penjualan. Pengganti mundur adalah 7 hari dari tanggal penempatan pesanan.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan atur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: Rename Tool,File to Rename,Nama File untuk Diganti
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Ambil Pembaruan Berlangganan
@@ -4671,7 +4662,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Apakah Biaya Keuangan?
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih dari satu paket dari jenis yang sama (untuk mencetak)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Instruktur di Pendidikan&gt; Pengaturan Pendidikan
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Harap tetapkan pelanggan default di Pengaturan Restoran
 ,Salary Register,Register Gaji
 DocType: Company,Default warehouse for Sales Return,Gudang default untuk Pengembalian Penjualan
@@ -4942,7 +4932,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Kegiatan Tertunda
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Buat Uji Lab
 DocType: Patient Appointment,Reminded,Mengingatkan
-DocType: Homepage Section,Cards,Kartu-kartu
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Lihat Bagan Akun
 DocType: Chapter Member,Chapter Member,Bab Anggota
 DocType: Material Request Plan Item,Minimum Order Quantity,Jumlah Pesanan Minimum
@@ -4960,7 +4949,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Tanggal mendatang tidak diizinkan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Tanggal Pengiriman yang Diharapkan harus setelah Tanggal Pesanan Penjualan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Tingkat Re-Order
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Pola Bagan Akun
+DocType: Company,Chart Of Accounts Template,Pola Bagan Akun
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Perbarui stok harus diaktifkan untuk faktur pembelian {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Harga Barang diperbarui untuk {0} di Daftar Harga {1}
@@ -5525,8 +5514,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Berbagi Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Faktur Penjualan {0} dibuat
 DocType: Employee,Confirmation Date,Konfirmasi Tanggal
-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","Hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Inpatient Occupancy,Check Out,Periksa
 DocType: C-Form,Total Invoiced Amount,Jumlah Total Tagihan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty tidak dapat lebih besar dari Max Qty
@@ -5733,7 +5720,6 @@
 DocType: Cheque Print Template,Cheque Width,Lebar Cek
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Memvalidasi Harga Jual untuk Item terhadap Purchase Rate atau Tingkat Penilaian
 DocType: Fee Schedule,Fee Schedule,Jadwal biaya
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Label Kolom:
 DocType: Bank Transaction,Settled,Diselesaikan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parameter
@@ -6407,6 +6393,7 @@
 DocType: Salary Component,Formula,Rumus
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Kuantitas yang Diperlukan
+DocType: Cash Flow Mapping Template,Template Name,Nama template
 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},Periode Akuntansi tumpang tindih dengan {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Akun penjualan
@@ -6467,7 +6454,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Seperti pada Tanggal
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Seperti pada Tanggal
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,tanggal pendaftaran
 DocType: Healthcare Settings,Out Patient SMS Alerts,SMS Pemberitahuan Pasien Luar
@@ -6533,7 +6520,6 @@
 DocType: Course Content,Quiz,Ulangan
 DocType: Subscription,Trial Period End Date,Tanggal Akhir Periode Uji Coba
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Tidak Authroized sejak {0} melebihi batas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Mulai memasukkan data dari sini:
 DocType: Serial No,Asset Status,Status Aset
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Meja restoran
@@ -6759,7 +6745,6 @@
 DocType: Contract,Party User,Pengguna Partai
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Aset tidak dibuat untuk <b>{0}</b> . Anda harus membuat aset secara manual.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Harap tentukan filter Perusahaan jika Group By &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posting Tanggal tidak bisa tanggal di masa depan
 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} tidak sesuai dengan {2} {3}
 DocType: Loan Repayment,Interest Payable,Hutang bunga
@@ -6994,7 +6979,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Harga rata-rata
 DocType: Appointment,Appointment With,Janji dengan
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Pembayaran Total dalam Jadwal Pembayaran harus sama dengan Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Tandai kehadiran sebagai <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Barang Dari Pelanggan"" tidak bisa mempunyai Tarif Valuasi"
 DocType: Subscription Plan Detail,Plan,Rencana
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Saldo Laporan Bank sesuai Buku Besar
@@ -7686,7 +7670,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Jumlah tunjangan maksimum karyawan {0} melebihi {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Jumlah cuti dialokasikan lebih dari hari pada periode
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analisis Tanah Terkait
-DocType: Pricing Rule,Percentage,Persentase
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Barang {0} harus barang persediaan
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Gudang 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 ?","Jadwal untuk {0} tumpang tindih, apakah Anda ingin melanjutkan setelah melewati slot yang tumpang tindih?"
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 1aff36b..c7145eb 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Verk í vinnslu
 DocType: Leave Control Panel,Branch (optional),Útibú (valfrjálst)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Vinsamlegast veldu dagsetningu
-DocType: Item Price,Minimum Qty ,Lágmarksfjöldi
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Lágmarksfjöldi
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Endurkoma BOM: {0} getur ekki verið barn af {1}
 DocType: Finance Book,Finance Book,Fjármálabók
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Holiday List
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Foreldrareikningurinn {0} er ekki til
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Endurskoðun og aðgerðir
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Þessi starfsmaður er þegar með dagbók með sama tímamerki. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,endurskoðandi
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Hagnaður / tap
 DocType: Crop,Perennial,Ævarandi
 DocType: Program,Is Published,Er birt
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Sýna afhendingarbréf
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Til að leyfa innheimtu yfir, skaltu uppfæra „Yfir innheimtuheimild“ í reikningsstillingum eða hlutnum."
 DocType: Patient Appointment,Procedure,Málsmeðferð
 DocType: Accounts Settings,Use Custom Cash Flow Format,Notaðu Custom Cash Flow Format
@@ -981,7 +979,6 @@
 DocType: Patient,Risk Factors,Áhættuþættir
 DocType: Patient,Occupational Hazards and Environmental Factors,Starfsáhættu og umhverfisþættir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Verðbréfaskráningar sem þegar eru búnar til fyrir vinnuskilaboð
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Vöruflokkur&gt; Vörumerki
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Sjá fyrri pantanir
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} samtöl
 DocType: Vital Signs,Respiratory rate,Öndunarhraði
@@ -1139,7 +1136,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Villa kom upp við uppfærsluferlið
 DocType: Restaurant Reservation,Restaurant Reservation,Veitingahús pöntun
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Atriðin þín
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Tillaga Ritun
 DocType: Payment Entry Deduction,Payment Entry Deduction,Greiðsla Entry Frádráttur
 DocType: Service Level Priority,Service Level Priority,Forgang þjónustustigsins
@@ -1438,7 +1434,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Vinsamlegast veldu félags og póstsetningu til að fá færslur
 DocType: Asset,Maintenance,viðhald
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Komdu frá sjúklingaþingi
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptahlutur ({0} -&gt; {1}) fannst ekki fyrir hlutinn: {2}
 DocType: Subscriber,Subscriber,Áskrifandi
 DocType: Item Attribute Value,Item Attribute Value,Liður Attribute gildi
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Gjaldmiðill verður að eiga við um kaup eða sölu.
@@ -1936,7 +1931,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Er skilað (skuldfærsla)
 DocType: Workstation,Wages,laun
 DocType: Asset Maintenance,Maintenance Manager Name,Nafn viðhaldsstjórans
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Nú þegar eru viðskipti við fyrirtækið!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Biður um síðu
 DocType: Agriculture Task,Urgent,Urgent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Sækir færslur ......
@@ -2633,7 +2627,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Greiðslutími í röð {0} er hugsanlega afrit.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Landbúnaður (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,pökkun Slip
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast stilltu Naming Series fyrir {0} með Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,skrifstofa leigu
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
 DocType: Disease,Common Name,Algengt nafn
@@ -2799,7 +2792,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Leaves Úthlutað Tókst fyrir {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Engir hlutir í pakka
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Aðeins .csv og .xlsx skrár eru studdar eins og er
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp nafnakerfi starfsmanna í mannauð&gt; HR stillingar
 DocType: Shipping Rule Condition,From Value,frá Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
 DocType: Loan,Repayment Method,endurgreiðsla Aðferð
@@ -4046,7 +4038,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Required On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ef hakað er við, felur og slekkur svæðið Rounded Total í launaseðlum"
 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.,Þetta er sjálfgefið móti (dagar) fyrir afhendingardag í sölupöntunum. Fallfallið er 7 dagar frá dagsetningu pöntunarinnar.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp númeraröð fyrir mætingu með uppsetningu&gt; Númeraröð
 DocType: Rename Tool,File to Rename,Skrá til Endurnefna
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Vinsamlegast veldu BOM fyrir lið í Row {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Fáðu áskriftaruppfærslur
@@ -4649,7 +4640,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Er fjármagnskostnaður
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Mæting fyrir starfsmann {0} er þegar merkt
 DocType: Packing Slip,If more than one package of the same type (for print),Ef fleiri en einn pakka af sömu gerð (fyrir prentun)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast settu upp kennslukerfi kennslukerfis í menntun&gt; Menntunarstillingar
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Vinsamlegast stilltu sjálfgefinn viðskiptavin í veitingastaðnum
 ,Salary Register,laun Register
 DocType: Company,Default warehouse for Sales Return,Sjálfgefið lager fyrir söluávöxtun
@@ -4920,7 +4910,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,bið Starfsemi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Búa til Lab Test
 DocType: Patient Appointment,Reminded,Minntist á
-DocType: Homepage Section,Cards,Spil
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Skoða töflu reikninga
 DocType: Chapter Member,Chapter Member,Kafli meðlimur
 DocType: Material Request Plan Item,Minimum Order Quantity,lágmarks magn pöntunar
@@ -4938,7 +4927,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Framtíðardagar ekki leyfðar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Væntanlegur afhendingardagur ætti að vera eftir söluupphæðardagsetningu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Uppröðun Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Mynd af reikningum sniðmáti
+DocType: Company,Chart Of Accounts Template,Mynd af reikningum sniðmáti
 DocType: Attendance,Attendance Date,Aðsókn Dagsetning
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Uppfæra hlutabréfa verður að vera virk fyrir kaupreikninginn {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Item Verð uppfærð fyrir {0} í verðskrá {1}
@@ -5503,8 +5492,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Sölureikningur {0} búinn til
 DocType: Employee,Confirmation Date,staðfesting Dagsetning
-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","Vinsamlegast eytt starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 DocType: Inpatient Occupancy,Check Out,Athuga
 DocType: C-Form,Total Invoiced Amount,Alls Upphæð á reikningi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Magn má ekki vera meiri en Max Magn
@@ -5711,7 +5698,6 @@
 DocType: Cheque Print Template,Cheque Width,ávísun Breidd
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Sannreyna söluverð lið gegn kaupgengi eða Verðmat Rate
 DocType: Fee Schedule,Fee Schedule,gjaldskrá
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Dálkamerkingar:
 DocType: Bank Transaction,Settled,Sátt
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Skil
 DocType: Quality Feedback,Parameters,Breytur
@@ -6385,6 +6371,7 @@
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Nauðsynlegt magn
+DocType: Cash Flow Mapping Template,Template Name,Sniðmát Nafn
 DocType: Lab Test Template,Lab Test Template,Lab Test Sniðmát
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Reikningstímabil skarast við {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Sölureikningur
@@ -6445,7 +6432,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ávísun Dagsetning
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Reikningur {0}: Foreldri reikningur {1} ekki tilheyra fyrirtæki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Eytt öll viðskipti sem tengjast þessu fyrirtæki!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Eins á degi
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Eins á degi
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,innritun Dagsetning
 DocType: Healthcare Settings,Out Patient SMS Alerts,Úthlutað þolinmæði fyrir sjúklinga
@@ -6511,7 +6498,6 @@
 DocType: Course Content,Quiz,Skyndipróf
 DocType: Subscription,Trial Period End Date,Prófunartímabil Lokadagur
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ekki authroized síðan {0} umfram mörk
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Byrjaðu að slá inn gögn héðan:
 DocType: Serial No,Asset Status,Eignastaða
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Yfir víddarflutning (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Veitingahús borðstofa
@@ -6737,7 +6723,6 @@
 DocType: Contract,Party User,Party notandi
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Eignir ekki búnar til fyrir <b>{0}</b> . Þú verður að búa til eign handvirkt.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Vinsamlegast stilltu Fyrirtæki sía eyða ef Group By er &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Landsvæði
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Staða Dagsetning má ekki vera liðinn
 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} passar ekki við {2} {3}
 DocType: Loan Repayment,Interest Payable,Vextir sem greiða ber
@@ -6972,7 +6957,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Meðaltal
 DocType: Appointment,Appointment With,Ráðning með
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samtals greiðslugjald í greiðsluáætlun verður að vera jafnt við Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merkja mætingu sem <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",„Hlutur sem veittur er af viðskiptavini“ getur ekki haft matshlutfall
 DocType: Subscription Plan Detail,Plan,Áætlun
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankayfirlit jafnvægi eins og á General Ledger
@@ -7663,7 +7647,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Hámarksframlagsþáttur starfsmanns {0} fer yfir {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Samtals úthlutað Blöðin eru fleiri en dagar á tímabilinu
 DocType: Linked Soil Analysis,Linked Soil Analysis,Tengd jarðvegsgreining
-DocType: Pricing Rule,Percentage,hlutfall
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Liður {0} verður að vera birgðir Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Sjálfgefið 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 ?","Tímaáætlanir fyrir {0} skarast, viltu halda áfram eftir að skipta yfirliða rifa?"
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 5f1a93c..901b24e 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Lavori in corso
 DocType: Leave Control Panel,Branch (optional),Branch (opzionale)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Seleziona la data
-DocType: Item Price,Minimum Qty ,Qtà minima
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Qtà minima
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Ricorsione DBA: {0} non può essere figlio di {1}
 DocType: Finance Book,Finance Book,Libro delle finanze
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Elenco vacanza
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,L&#39;account principale {0} non esiste
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisione e azione
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Questo impiegato ha già un registro con lo stesso timestamp. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Ragioniere
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Utile / Perdita
 DocType: Crop,Perennial,Perenne
 DocType: Program,Is Published,È pubblicato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Mostra le note di consegna
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Per consentire la fatturazione in eccesso, aggiorna &quot;Assegno di fatturazione in eccesso&quot; in Impostazioni account o Articolo."
 DocType: Patient Appointment,Procedure,Procedura
 DocType: Accounts Settings,Use Custom Cash Flow Format,Usa il formato del flusso di cassa personalizzato
@@ -981,7 +979,6 @@
 DocType: Patient,Risk Factors,Fattori di rischio
 DocType: Patient,Occupational Hazards and Environmental Factors,Pericoli professionali e fattori ambientali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Registrazioni azionarie già create per ordine di lavoro
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Vedi gli ordini passati
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} conversazioni
 DocType: Vital Signs,Respiratory rate,Frequenza respiratoria
@@ -1139,7 +1136,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Si è verificato un errore durante il processo di aggiornamento
 DocType: Restaurant Reservation,Restaurant Reservation,Prenotazione Ristorante
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,I tuoi articoli
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Scrivere proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Deduzione di Pagamento
 DocType: Service Level Priority,Service Level Priority,Priorità del livello di servizio
@@ -1438,7 +1434,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Seleziona Società e Data di pubblicazione per ottenere le voci
 DocType: Asset,Maintenance,Manutenzione
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Ottenere dall&#39;incontro paziente
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fattore di conversione UOM ({0} -&gt; {1}) non trovato per l&#39;articolo: {2}
 DocType: Subscriber,Subscriber,abbonato
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Cambio valuta deve essere applicabile per l&#39;acquisto o per la vendita.
@@ -1955,7 +1950,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),È il ritorno (nota di debito)
 DocType: Workstation,Wages,Salari
 DocType: Asset Maintenance,Maintenance Manager Name,Nome del responsabile della manutenzione
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Esistono già transazioni contro l&#39;azienda!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Sito richiedente
 DocType: Agriculture Task,Urgent,Urgente
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Recupero record ...
@@ -2653,7 +2647,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Il termine di pagamento nella riga {0} è probabilmente un duplicato.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Agricoltura (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Documento di trasporto
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Affitto Ufficio
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Configura impostazioni gateway SMS
 DocType: Disease,Common Name,Nome comune
@@ -2819,7 +2812,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Permessi allocati con successo per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Non ci sono elementi per il confezionamento
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Attualmente sono supportati solo i file .csv e .xlsx
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di impostare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni risorse umane
 DocType: Shipping Rule Condition,From Value,Da Valore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
 DocType: Loan,Repayment Method,Metodo di rimborso
@@ -4067,7 +4059,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Richiesto On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Se selezionato, nasconde e disabilita il campo Totale arrotondato nelle buste paga"
 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.,Questo è l&#39;offset predefinito (giorni) per la data di consegna negli ordini cliente. L&#39;offset di fallback è di 7 giorni dalla data di collocamento dell&#39;ordine.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Impostare le serie di numerazione per la partecipazione tramite Impostazione&gt; Serie di numerazione
 DocType: Rename Tool,File to Rename,File da rinominare
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Seleziona la Distinta Base per l'Articolo nella riga {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Recupera gli aggiornamenti delle iscrizioni
@@ -4702,7 +4693,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,È il costo finanziario
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Assistenza per dipendente {0} è già contrassegnata
 DocType: Packing Slip,If more than one package of the same type (for print),Se più di un pacchetto dello stesso tipo (per la stampa)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configura il sistema di denominazione dell&#39;istruttore in Istruzione&gt; Impostazioni istruzione
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Impostare il cliente predefinito in Impostazioni ristorante
 ,Salary Register,stipendio Register
 DocType: Company,Default warehouse for Sales Return,Magazzino predefinito per il reso
@@ -4973,7 +4963,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Attività in sospeso
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Crea un test di laboratorio
 DocType: Patient Appointment,Reminded,ricordato
-DocType: Homepage Section,Cards,Carte
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Visualizza il piano dei conti
 DocType: Chapter Member,Chapter Member,Membro del Capitolo
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantità ordine minimo
@@ -4991,7 +4980,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Date future non consentite
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La data di consegna confermata dovrebbe essere successiva alla data dell'Ordine di Vendita
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Riordina Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Modello del Piano dei Conti
+DocType: Company,Chart Of Accounts Template,Modello del Piano dei Conti
 DocType: Attendance,Attendance Date,Data presenza
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Lo stock di aggiornamento deve essere abilitato per la fattura di acquisto {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Prezzo Articolo aggiornato per {0} nel Listino {1}
@@ -5556,8 +5545,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Condividi libro mastro
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,La fattura di vendita {0} è stata creata
 DocType: Employee,Confirmation Date,Data di conferma
-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","Elimina il dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per annullare questo documento"
 DocType: Inpatient Occupancy,Check Out,Check-out
 DocType: C-Form,Total Invoiced Amount,Importo Totale Fatturato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,La quantità Min non può essere maggiore della quantità Max
@@ -5765,7 +5752,6 @@
 DocType: Cheque Print Template,Cheque Width,Larghezza Assegno
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Convalida il prezzo di vendita dell'articolo dal prezzo di acquisto o dal tasso di valutazione
 DocType: Fee Schedule,Fee Schedule,Tariffario
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Etichette colonna:
 DocType: Bank Transaction,Settled,sistemato
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,parametri
@@ -6439,6 +6425,7 @@
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Quantità richiesta
+DocType: Cash Flow Mapping Template,Template Name,Nome modello
 DocType: Lab Test Template,Lab Test Template,Modello di prova del laboratorio
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Il periodo contabile si sovrappone a {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Conto vendita
@@ -6499,7 +6486,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: conto derivato {1} non appartiene alla società: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,"Tutte le operazioni relative a questa società, sono state cancellate con successo!"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Come in data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Come in data
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Iscrizione Data
 DocType: Healthcare Settings,Out Patient SMS Alerts,Avvisi SMS di pazienti
@@ -6565,7 +6552,6 @@
 DocType: Course Content,Quiz,Quiz
 DocType: Subscription,Trial Period End Date,Data di fine periodo di prova
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Non autorizzato poiché {0} supera i limiti
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Inizia a inserire i dati da qui:
 DocType: Serial No,Asset Status,Stato delle risorse
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Ristorante Tavolo
@@ -6791,7 +6777,6 @@
 DocType: Contract,Party User,Utente del party
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Risorse non create per <b>{0}</b> . Dovrai creare risorse manualmente.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Impostare il filtro aziendale vuoto se Group By è &#39;Azienda&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,La Data di Registrazione non può essere una data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
 DocType: Loan Repayment,Interest Payable,Interessi da pagare
@@ -7026,7 +7011,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Tasso medio
 DocType: Appointment,Appointment With,Appuntamento con
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;importo totale del pagamento nel programma di pagamento deve essere uguale al totale totale / arrotondato
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Segna la partecipazione come <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Articolo fornito dal cliente&quot; non può avere un tasso di valutazione
 DocType: Subscription Plan Detail,Plan,Piano
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Estratto conto banca come da Contabilità Generale
@@ -7717,7 +7701,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},L&#39;importo massimo del beneficio del dipendente {0} supera {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Totale ferie assegnate sono più giorni nel periodo
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analisi del suolo collegata
-DocType: Pricing Rule,Percentage,Percentuale
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,L'Articolo {0} deve essere in Giacenza
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Deposito di default per 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 ?","Schedule per {0} si sovrappone, vuoi procedere dopo aver saltato gli slot sovrapposti?"
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 70a15f6..fd2946f 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -168,12 +168,11 @@
 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 @@
 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,カスタムキャッシュフローフォーマットの使用
@@ -982,7 +980,6 @@
 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 &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 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,呼吸数
@@ -1140,7 +1137,6 @@
 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 &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 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,サービスレベル優先度
@@ -1439,7 +1435,6 @@
 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} -&gt; {1}) not found for item: {2},アイテムのUOM換算係数（{0}-&gt; {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.,通貨交換は、購入または販売に適用する必要があります。
@@ -1963,7 +1958,6 @@
 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......,レコードを取得しています......
@@ -2661,7 +2655,6 @@
 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 &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [命名シリーズ]で{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,一般名
@@ -2828,7 +2821,6 @@
 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 &gt; HR Settings,人事管理&gt; 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,返済方法
@@ -4077,7 +4069,6 @@
 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 &gt; Numbering Series,[設定]&gt; [番号シリーズ]を使用して、出席の番号シリーズを設定してください
 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} 内のアイテムの部品表（BOM）を選択してください
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,購読の更新を取得する
@@ -4718,7 +4709,6 @@
 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 &gt; Education Settings,[教育]&gt; [教育の設定]でインストラクターの命名システムを設定してください
 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,返品のデフォルト倉庫
@@ -4989,7 +4979,6 @@
 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,最小注文数量
@@ -5007,7 +4996,7 @@
 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},アイテムの価格は価格表{1}で{0}の更新します
@@ -5572,8 +5561,6 @@
 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,最小個数は最大個数を超えることはできません
@@ -5780,7 +5767,6 @@
 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,パラメーター
@@ -6454,6 +6440,7 @@
 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,セールスアカウント
@@ -6514,7 +6501,7 @@
 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アラート
@@ -6580,7 +6567,6 @@
 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,レストラン表
@@ -6807,7 +6793,6 @@
 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が &#39;Company&#39;の場合、Companyフィルターを空白に設定してください
-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,支払利息
@@ -7040,7 +7025,6 @@
 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,総勘定元帳ごとの銀行取引明細残高
@@ -7733,7 +7717,6 @@
 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}のスケジュールが重複しています。重複スロットをスキップした後に進めますか？
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 95aeed9..37da854 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -168,11 +168,10 @@
 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 -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,គណនេយ្យករ
@@ -244,7 +243,6 @@
 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,ប្រើទំរង់លំហូរសាច់ប្រាក់ផ្ទាល់ខ្លួន
@@ -973,7 +971,6 @@
 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 &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក
 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,អត្រាផ្លូវដង្ហើម
@@ -1130,7 +1127,6 @@
 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 &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
 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,អាទិភាពកម្រិតសេវាកម្ម។
@@ -1921,7 +1917,6 @@
 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......,ការទៅយកកំណត់ត្រា ......
@@ -2611,7 +2606,6 @@
 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 &gt; Settings &gt; Naming Series,សូមកំណត់ឈ្មោះដាក់ឈ្មោះសំរាប់ {0} តាមរយៈតំឡើង&gt; ការកំណត់&gt; តំរុយឈ្មោះ
 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,ឈ្មោះទូទៅ
@@ -2776,7 +2770,6 @@
 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 &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
 DocType: Loan,Repayment Method,វិធីសាស្រ្តការទូទាត់សង
@@ -4011,7 +4004,6 @@
 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.,នេះគឺជាអុហ្វសិតលំនាំដើម (ថ្ងៃ) សម្រាប់កាលបរិច្ឆេទដឹកជញ្ជូនក្នុងការបញ្ជាទិញការលក់។ អុហ្វសិតជំនួសគឺ ៧ ថ្ងៃគិតចាប់ពីថ្ងៃដាក់ការបញ្ជាទិញ។
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង
 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,ទទួលយកការធ្វើបច្ចុប្បន្នភាពការជាវប្រចាំ
@@ -4605,7 +4597,6 @@
 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 &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ
 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,ឃ្លាំងលំនាំដើមសម្រាប់ការលក់ត្រឡប់មកវិញ។
@@ -4874,7 +4865,6 @@
 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,បរិមាណលំដាប់អប្បបរមា
@@ -4892,7 +4882,7 @@
 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}
@@ -5456,8 +5446,6 @@
 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,ចំនួន invoiced សរុប
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,លោក Min Qty មិនអាចជាធំជាងអតិបរមា Qty
@@ -5664,7 +5652,6 @@
 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,ប៉ារ៉ាម៉ែត្រ។
@@ -6346,6 +6333,7 @@
 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,គណនីលក់
@@ -6405,7 +6393,7 @@
 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,ការជូនដំណឹងជាអក្សរសម្រាប់អ្នកជម្ងឺ
@@ -6471,7 +6459,6 @@
 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,តារាងភោជនីយដ្ឋាន
@@ -6698,7 +6685,6 @@
 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,ការប្រាក់ត្រូវបង់
@@ -6935,7 +6921,6 @@
 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,ធនាគារតុល្យភាពសេចក្តីថ្លែងការណ៍ដូចជាក្នុងសៀវភៅធំ
@@ -7623,7 +7608,6 @@
 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} ជាន់គ្នា, តើអ្នកចង់បន្តបន្ទាប់ពីការរំលងរន្ធច្រើន?"
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 6cc1faa..df92a2d 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -165,7 +165,7 @@
 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 ,ಕನಿಷ್ಠ ಕ್ಯೂಟಿ
+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.-,ಹೆಚ್ಎಲ್ಸಿ-ಎನ್ಎನ್ಸಿ - .YYYY.-
 DocType: Appointment Booking Settings,Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ
@@ -240,7 +240,6 @@
 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.","ಬಿಲ್ಲಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸಲು, ಖಾತೆಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಅಥವಾ ಐಟಂನಲ್ಲಿ &quot;ಓವರ್ ಬಿಲ್ಲಿಂಗ್ ಭತ್ಯೆ&quot; ಅನ್ನು ನವೀಕರಿಸಿ."
 DocType: Patient Appointment,Procedure,ವಿಧಾನ
 DocType: Accounts Settings,Use Custom Cash Flow Format,ಕಸ್ಟಮ್ ಕ್ಯಾಶ್ ಫ್ಲೋ ಫಾರ್ಮ್ಯಾಟ್ ಬಳಸಿ
@@ -970,7 +969,6 @@
 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 &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 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,ಉಸಿರಾಟದ ದರ
@@ -1123,7 +1121,6 @@
 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 &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 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,ಸೇವಾ ಮಟ್ಟದ ಆದ್ಯತೆ
@@ -1422,7 +1419,6 @@
 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} -&gt; {1}) not found for item: {2},ಐಟಂಗೆ UOM ಪರಿವರ್ತನೆ ಅಂಶ ({0} -&gt; {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.,ಕರೆನ್ಸಿ ಎಕ್ಸ್ಚೇಂಜ್ ಬೈಯಿಂಗ್ ಅಥವಾ ಸೆಲ್ಲಿಂಗ್ಗೆ ಅನ್ವಯವಾಗಬೇಕು.
@@ -1935,7 +1931,6 @@
 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......,ದಾಖಲೆಗಳನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ ......
@@ -2783,7 +2778,6 @@
 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 &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Shipping Rule Condition,From Value,FromValue
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 DocType: Loan,Repayment Method,ಮರುಪಾವತಿಯ ವಿಧಾನ
@@ -4012,7 +4006,6 @@
 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 &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 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,ಚಂದಾದಾರಿಕೆ ಅಪ್ಡೇಟ್ಗಳನ್ನು ಪಡೆಯಿರಿ
@@ -4639,7 +4632,6 @@
 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 &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 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,ಮಾರಾಟ ರಿಟರ್ನ್‌ಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಗೋದಾಮು
@@ -4904,7 +4896,6 @@
 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,ಕನಿಷ್ಠ ಆರ್ಡರ್ ಪ್ರಮಾಣ
@@ -4920,7 +4911,7 @@
 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}
@@ -5478,8 +5469,6 @@
 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,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,ಮಿನ್ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ ಸಾಧ್ಯವಿಲ್ಲ
@@ -5683,7 +5672,6 @@
 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,ನಿಯತಾಂಕಗಳು
@@ -6358,6 +6346,7 @@
 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,ಒಟ್ಟು ತೂಕ
@@ -6416,7 +6405,7 @@
 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,ರೋಗಿಯ ಎಸ್ಎಂಎಸ್ ಅಲರ್ಟ್ ಔಟ್
@@ -6481,7 +6470,6 @@
 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),ಓವರ್ ಡೈಮೆನ್ಷನಲ್ ಕಾರ್ಗೋ (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,ರೆಸ್ಟೋರೆಂಟ್ ಟೇಬಲ್
@@ -6702,7 +6690,6 @@
 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,ಪಾವತಿಸಬೇಕಾದ ಬಡ್ಡಿ
@@ -6934,7 +6921,6 @@
 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,ಜನರಲ್ ಲೆಡ್ಜರ್ ಪ್ರಕಾರ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
@@ -7610,7 +7596,6 @@
 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} ಅತಿಕ್ರಮಿಸುವಿಕೆಗಾಗಿ, ನೀವು ಅತಿಕ್ರಮಿಸಿದ ಸ್ಲಾಟ್ಗಳನ್ನು ಬಿಟ್ಟು ನಂತರ ಮುಂದುವರಿಯಲು ಬಯಸುವಿರಾ?"
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 7c73047..0557320 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -168,12 +168,11 @@
 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 @@
 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.",과금을 허용하려면 계정 설정 또는 항목에서 &quot;청구 대금 초과&quot;를 업데이트하십시오.
 DocType: Patient Appointment,Procedure,순서
 DocType: Accounts Settings,Use Custom Cash Flow Format,맞춤형 현금 흐름 형식 사용
@@ -989,7 +987,6 @@
 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 &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 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,호흡
@@ -1148,7 +1145,6 @@
 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 &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 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,서비스 수준 우선 순위
@@ -1450,7 +1446,6 @@
 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} -&gt; {1}) not found for item: {2},항목 {2}에 대한 UOM 변환 계수 ({0}-&gt; {1})를 찾을 수 없습니다
 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.,환전은 구매 또는 판매에 적용 할 수 있어야합니다.
@@ -1971,7 +1966,6 @@
 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......,레코드를 가져 오는 중 ...... ......
@@ -2675,7 +2669,6 @@
 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 &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {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,공통 이름
@@ -2842,7 +2835,6 @@
 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 &gt; HR Settings,인사 관리&gt; 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,상환 방법
@@ -4102,7 +4094,6 @@
 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 &gt; Numbering Series,설정&gt; 넘버링 시리즈를 통해 출석 용 넘버링 시리즈를 설정하십시오
 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,구독 업데이트 가져 오기
@@ -4741,7 +4732,6 @@
 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 &gt; Education Settings,교육&gt; 교육 설정에서 강사 명명 시스템을 설정하십시오
 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,판매 반환을위한 기본 창고
@@ -5014,7 +5004,6 @@
 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,최소 주문 수량
@@ -5032,7 +5021,7 @@
 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}
@@ -5603,8 +5592,6 @@
 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,최소 수량이 최대 수량보다 클 수 없습니다
@@ -5813,7 +5800,6 @@
 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,매개 변수
@@ -6498,6 +6484,7 @@
 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,판매 계정
@@ -6558,7 +6545,7 @@
 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 경고
@@ -6624,7 +6611,6 @@
 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 Not
-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),"초과화물 (Over Dimensional Cargo, ODC)"
 DocType: Restaurant Order Entry,Restaurant Table,레스토랑 테이블
@@ -6852,7 +6838,6 @@
 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,채무
@@ -7089,7 +7074,6 @@
 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,총계정 원장에 따라 은행 잔고 잔액
@@ -7786,7 +7770,6 @@
 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}의 일정이 겹칩니다. 겹친 슬롯을 건너 뛰고 계속 하시겠습니까?
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 162c774..62571b5 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -165,11 +165,10 @@
 DocType: Work Order Operation,Work In Progress,Kar berdewam e
 DocType: Leave Control Panel,Branch (optional),Chaxê (vebijarkî)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Ji kerema xwe ve date hilbijêre
-DocType: Item Price,Minimum Qty ,Min Qty
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Min Qty
 DocType: Finance Book,Finance Book,Book Book
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-YYYY-
 DocType: Appointment Booking Settings,Holiday List,Lîsteya Holiday
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Hesabê dêûbavê {0} tune
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Review û Action
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Hesabdar
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Lîsteya bihayê bihayê
@@ -239,7 +238,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Pawlos / Gelek
 DocType: Crop,Perennial,Perennial
 DocType: Program,Is Published,Weşandin e
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Nîşeyên Delivery nîşan bidin
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Ji bo destûrdayîna zêdekirina billing, di Settings Hesaban an Tiştê de &quot;Over Allowance Billing&quot; nûve bike."
 DocType: Patient Appointment,Procedure,Doz
 DocType: Accounts Settings,Use Custom Cash Flow Format,Forma Qanûna Kredê Custom Use
@@ -970,7 +968,6 @@
 DocType: Patient,Risk Factors,Faktorên Raks
 DocType: Patient,Occupational Hazards and Environmental Factors,Hêzên karûbar û Faktorên hawirdorê
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Bersên Stock Stock ji bo ji bo karê karê ji bo xebitandin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda Babetê&gt; Koma Rêzan&gt; Brand
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Fermanên paşîn bibînin
 DocType: Vital Signs,Respiratory rate,Rêjeya berbiçav
 apps/erpnext/erpnext/config/help.py,Managing Subcontracting,birêvebirina îhaleya
@@ -1122,7 +1119,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Di dema pêvajoyê de çewtiyek çêbû
 DocType: Restaurant Reservation,Restaurant Reservation,Reservation Restaurant
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Tiştên we
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Writing Pêşniyarek
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment dabirîna Peyam
 DocType: Service Level Priority,Service Level Priority,Serokatiya Astana Karûbarê
@@ -1918,7 +1914,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Vegerîn (Debit Note)
 DocType: Workstation,Wages,Yomî
 DocType: Asset Maintenance,Maintenance Manager Name,Navê Mersûmê Navend
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Danûstandinên li dijî pargîdanî jixwe hene!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Daxwaza Malperê
 DocType: Agriculture Task,Urgent,Acîl
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Fetching records ......
@@ -2602,7 +2597,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Terta Dravê ya di rêza {0} de dibe ku dubareyek be.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Çandinî (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 &gt; Settings &gt; Naming Series,Ji kerema xwe Sêwirandina Navên foran ji bo {0} bi hêla Setup&gt; Mîhengên&gt; Navên Pîroz bikin
 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,settings deryek Setup SMS
 DocType: Disease,Common Name,Navê Navîn
@@ -2764,7 +2758,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Pelên bi awayekî serketî ji bo bi rêk û {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,No babet to pack
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Tenê pelên .csv û .xlsx niha piştgirî ne
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe di Resavkaniya Mirovan de&gt; Sîstema Navkirin a Karmendiyê Saz bikin
 DocType: Shipping Rule Condition,From Value,ji Nirx
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
 DocType: Loan,Repayment Method,Method vegerandinê
@@ -3987,7 +3980,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,required ser
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ger kontrol kirin, li Zeviyên Salary Di zeviyê Rounded Total de veşartî û nexşandin"
 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.,Ev ji bo Dravdana Firotanê di Fermana Firotanê de qewata xwerû ya rojane ye (rojan). Rêjeya hilweşandinê 7 roj ji roja plankirina fermanê ye.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ji hêla Tevlêbûnê&gt; Pêjeya Hejmarbûnê ve ji bo Pêvekêşandinê hejmarên hejmarê saz bikin
 DocType: Rename Tool,File to Rename,File to Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Ji kerema xwe ve BOM li Row hilbijêre ji bo babet {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Fetch Subscription Updates
@@ -4581,7 +4573,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Fînansê Fînansî ye
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Amadebûna ji bo karker {0} jixwe nîşankirin
 DocType: Packing Slip,If more than one package of the same type (for print),Eger zêdetir ji pakêta cureyê eynî (ji bo print)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe Li Perwerde&gt; Mîhengên Perwerdehiyê Sîstema Navkirin a Sêwiran saz bikin
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Ji kerema xwe ya mişterî ya li Restaurant Settings
 ,Salary Register,meaş Register
 DocType: Company,Default warehouse for Sales Return,Wargeha xilas ji bo Vegera Firotanê
@@ -4847,7 +4838,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Çalakî hîn
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Test Lab test
 DocType: Patient Appointment,Reminded,Reminded
-DocType: Homepage Section,Cards,Kartên
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Dîteya Kartê bibînin
 DocType: Chapter Member,Chapter Member,Endamê Endamê
 DocType: Material Request Plan Item,Minimum Order Quantity,Hejmarê herî kêmîn
@@ -4863,7 +4853,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Rojên pêşeroj nayê destûr kirin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Divê Dîroka Daxuyaniya Dîrokê Divê piştî Sermarkirina Darmendê
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Level DIRTYHERTZ
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Chart bikarhênerên Şablon
+DocType: Company,Chart Of Accounts Template,Chart bikarhênerên Şablon
 DocType: Attendance,Attendance Date,Date amadebûnê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Divê belgeya nûvekirina belgeyê ji bo veberhênana kirînê ve bikaribe {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Babetê Price ve ji bo {0} li List Price {1}
@@ -5620,7 +5610,6 @@
 DocType: Cheque Print Template,Cheque Width,Firehiya Cheque
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validate Selling Beha bo Babetê dijî Rate Purchase an Rate Valuation
 DocType: Fee Schedule,Fee Schedule,Cedwela Fee
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Labels Column:
 DocType: Bank Transaction,Settled,Bi cî kirin
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametreyên
@@ -6290,6 +6279,7 @@
 DocType: Salary Component,Formula,Formîl
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Quantity pêwîst
+DocType: Cash Flow Mapping Template,Template Name,Navê Şablon
 DocType: Lab Test Template,Lab Test Template,Template Test Lab
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Hesabê firotanê
 DocType: Purchase Invoice Item,Total Weight,Total Weight
@@ -6348,7 +6338,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Date Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: account Parent {1} ne aîdî ji şîrketa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Bi serkeftin hat hemû muameleyên girêdayî vê şîrketê!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Wekî ku li ser Date
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Wekî ku li ser Date
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Date nivîsînî
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alerts Alîkariya Nexweş
@@ -6413,7 +6403,6 @@
 DocType: Course Content,Quiz,Pirsok
 DocType: Subscription,Trial Period End Date,Dîroka Doza Têkoşînê
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,authroized ne ji ber ku {0} dibuhure ji sînorên
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Danasîna daneyên ji vir dest pê bikin:
 DocType: Serial No,Asset Status,Status Status
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Di Karûbarên Dimensî de (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurant Table
@@ -6633,7 +6622,6 @@
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Review Review
 DocType: Contract,Party User,Partiya Bikarhêner
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Xêra xwe Company wêr&#39;a vala eger Pol By e &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Koma Xerîdar&gt; Herêm
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Deaktîv bike Date nikare bibe dîroka pêşerojê de
 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} nayê bi hev nagirin {2} {3}
 DocType: Loan Repayment,Interest Payable,Dravê Bacê
@@ -6867,7 +6855,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Rêjeya Navîn
 DocType: Appointment,Appointment With,Bi Hevdîtin
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Gava Tiştê Tevî Di nav deynê şertê divê divê tevahî Gund / Gundî be
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Mark beşdarbûn wek <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Tişta peydakirî ya xerîdar&quot; nikare Rêjeya Valasyonê tune
 DocType: Subscription Plan Detail,Plan,Pîlan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,balance Statement Bank wek per General Ledger
@@ -7544,7 +7531,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Gelek xercê karmendê {0} zêde dike {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Hemû pelên bi rêk û zêdetir in ji rojan di dema
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analyzed Soil Analysis
-DocType: Pricing Rule,Percentage,Rêza sedikê
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Babetê {0} divê stock babete be
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Kar In Warehouse Progress
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Schedule ji bo {0} overlaps, tu dixwazî piştî ku paqijkirina slotên bêhtir diçin?"
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 714d01b..f9534ce 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -168,12 +168,11 @@
 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 ,Minimum Qty
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,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,Book Finance
 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 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,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.","ເພື່ອອະນຸຍາດການເອີ້ນເກັບເງິນ, ໃຫ້ອັບເດດ &quot;Over Billing Allowance&quot; ໃນການຕັ້ງຄ່າບັນຊີຫລືລາຍການ."
 DocType: Patient Appointment,Procedure,Procedure
 DocType: Accounts Settings,Use Custom Cash Flow Format,ໃຊ້ Custom Flow Format Format
@@ -989,7 +987,6 @@
 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 &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມລາຍການ&gt; ຍີ່ຫໍ້
 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,ອັດຕາການຫາຍໃຈ
@@ -1148,7 +1145,6 @@
 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 &gt; Supplier Type,ຜູ້ສະ ໜອງ ສິນຄ້າ&gt; ປະເພດຜູ້ສະ ໜອງ ສິນຄ້າ
 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,ບູລິມະສິດໃນລະດັບການບໍລິການ
@@ -1451,7 +1447,6 @@
 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} -&gt; {1}) not found for item: {2},ປັດໄຈການປ່ຽນ UOM ({0} -&gt; {1}) ບໍ່ພົບ ສຳ ລັບລາຍການ: {2}
 DocType: Subscriber,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.,ການແລກປ່ຽນເງິນຕາຕ້ອງໃຊ້ສໍາລັບການຊື້ຫຼືຂາຍ.
@@ -1953,7 +1948,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),ແມ່ນການກັບຄືນມາ (Note Note)
 DocType: Workstation,Wages,ຄ່າແຮງງານ
 DocType: Asset Maintenance,Maintenance Manager Name,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......,ບັນທຶກຂໍ້ມູນບັນທຶກ ......
@@ -2656,7 +2650,6 @@
 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),ການກະສິກໍາ (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 &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຄ່າການໃສ່ຊື່ ສຳ ລັບ {0} ຜ່ານການຕັ້ງຄ່າ&gt; ການຕັ້ງຄ່າ&gt; ຊຸດການຕັ້ງຊື່
 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,ຊື່ທົ່ວໄປ
@@ -2823,7 +2816,6 @@
 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 &gt; HR Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; ການຕັ້ງຄ່າ 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,ວິທີການຊໍາລະ
@@ -4083,7 +4075,6 @@
 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 &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຊຸດ ໝາຍ ເລກ ສຳ ລັບການເຂົ້າຮຽນຜ່ານການຕັ້ງຄ່າ&gt; ເລກ ລຳ ດັບ
 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,Fetch Subscription Updates
@@ -4691,7 +4682,6 @@
 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 &gt; Education Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຜູ້ສອນໃນການສຶກສາ&gt; ການຕັ້ງຄ່າການສຶກສາ
 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,ຄັງສິນຄ້າເລີ່ມຕົ້ນ ສຳ ລັບການສົ່ງຄືນການຂາຍ
@@ -4964,7 +4954,6 @@
 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,Chapter Member
 DocType: Material Request Plan Item,Minimum Order Quantity,ຈໍານວນສັ່ງຊື້ຂັ້ນຕ່ໍາ
@@ -4982,7 +4971,7 @@
 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,ວັນທີຄາດວ່າສົ່ງຄວນຈະຕາມລະບຽບ Sales ວັນທີ່
 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 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,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,Min ຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວານ້ໍາຈໍານວນ
@@ -5763,7 +5750,6 @@
 DocType: Cheque Print Template,Cheque Width,Width Cheque
 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,Cess
 DocType: Quality Feedback,Parameters,ພາລາມິເຕີ
@@ -6448,6 +6434,7 @@
 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,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,ບັນຊີການຂາຍ
@@ -6508,7 +6495,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ວັນທີ່ສະຫມັກ Cheque
 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 ຂອງຄົນເຈັບ
@@ -6574,7 +6561,6 @@
 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),Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurant Table
@@ -6802,7 +6788,6 @@
 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',ກະລຸນາຕັ້ງບໍລິສັດກັ່ນຕອງ blank ຖ້າ Group By ແມ່ນ &#39;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}: ບໍ່ມີ Serial {1} ບໍ່ກົງກັບ {2} {3}"
 DocType: Loan Repayment,Interest Payable,ດອກເບ້ຍທີ່ຈ່າຍໄດ້
@@ -7039,7 +7024,6 @@
 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 / Total 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",&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,ທະນາຄານການດຸ່ນດ່ຽງງົບເປັນຕໍ່ຊີແຍກປະເພດທົ່ວໄປ
@@ -7735,7 +7719,6 @@
 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,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,ເຮັດໃນຕອນຕົ້ນໃນ Warehouse 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} overlaps, ທ່ານຕ້ອງການດໍາເນີນການຫຼັງຈາກ skiping slots overlaped?"
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 8dff444..b643d8d 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Darbas vyksta
 DocType: Leave Control Panel,Branch (optional),Filialas (neprivaloma)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Prašome pasirinkti datą
-DocType: Item Price,Minimum Qty ,Minimalus kiekis
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimalus kiekis
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM rekursija: {0} negali būti {1} vaikas
 DocType: Finance Book,Finance Book,Finansų knyga
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Atostogų sąrašas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Pagrindinė sąskaita {0} neegzistuoja
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Apžvalga ir veiksmas
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Šis darbuotojas jau turi žurnalą su ta pačia laiko žyma. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,buhalteris
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Pelnas / nuostoliai
 DocType: Crop,Perennial,Daugiametis
 DocType: Program,Is Published,Skelbiama
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Rodyti pristatymo pastabas
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Jei norite leisti pateikti daugiau sąskaitų nei sąskaitoje, atnaujinkite skiltį „Sąskaitų nustatymai“ arba elementas „Permokos už viršytą atsiskaitymą“."
 DocType: Patient Appointment,Procedure,Procedūra
 DocType: Accounts Settings,Use Custom Cash Flow Format,Naudokite tinkintą pinigų srautų formatą
@@ -986,7 +984,6 @@
 DocType: Patient,Risk Factors,Rizikos veiksniai
 DocType: Patient,Occupational Hazards and Environmental Factors,Profesiniai pavojai ir aplinkos veiksniai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Daliniai įrašai jau sukurta darbo užsakymui
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekių grupė&gt; Prekės ženklas
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Peržiūrėkite ankstesnius užsakymus
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} pokalbiai
 DocType: Vital Signs,Respiratory rate,Kvėpavimo dažnis
@@ -1144,7 +1141,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Atnaujinimo proceso metu įvyko klaida
 DocType: Restaurant Reservation,Restaurant Reservation,Restorano rezervavimas
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Jūsų daiktai
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Pasiūlymas rašymas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Mokėjimo Įėjimo išskaičiavimas
 DocType: Service Level Priority,Service Level Priority,Aptarnavimo lygio prioritetas
@@ -1446,7 +1442,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Jei norite gauti įrašus, pasirinkite Įmonės ir paskelbimo datą"
 DocType: Asset,Maintenance,priežiūra
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Gaukite &quot;Patient Encounter&quot;
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversijos koeficientas ({0} -&gt; {1}) nerastas elementui: {2}
 DocType: Subscriber,Subscriber,Abonentas
 DocType: Item Attribute Value,Item Attribute Value,Prekė Pavadinimas Reikšmė
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valiutos keitimas turi būti taikomas pirkimui arba pardavimui.
@@ -1948,7 +1943,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Ar grąžinimas (debeto pastaba)
 DocType: Workstation,Wages,užmokestis
 DocType: Asset Maintenance,Maintenance Manager Name,Techninės priežiūros vadybininko vardas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Sandoriai su įmone jau egzistuoja!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Prašoma svetainė
 DocType: Agriculture Task,Urgent,skubus
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Gaunami įrašai ......
@@ -2816,7 +2810,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lapai Paskirti sėkmingai {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Neturite prekių pakuotės
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Šiuo metu palaikomi tik .csv ir .xlsx failai
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų įvardijimo sistemą skyriuje Žmogiškieji ištekliai&gt; HR nustatymai
 DocType: Shipping Rule Condition,From Value,nuo Vertė
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
 DocType: Loan,Repayment Method,grąžinimas būdas
@@ -4075,7 +4068,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Reikalinga Apie
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Jei pažymėtas, paslepia ir išjungia „Apvalų bendrą“ laukelį „Atlyginimų kortelės“"
 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.,Tai yra numatytasis pristatymo datos įskaitymas (dienomis) pardavimo užsakymuose. Atsargų kompensavimas yra 7 dienos nuo užsakymo pateikimo dienos.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatyti numeracijos serijas lankymui per sąranką&gt; Numeravimo serijos
 DocType: Rename Tool,File to Rename,Failo pervadinti
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Prašome pasirinkti BOM už prekę eilutėje {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Atsisiųskite prenumeratos naujinius
@@ -4681,7 +4673,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Ar yra finansinės išlaidos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Lankomumas darbuotojo {0} jau yra pažymėtas
 DocType: Packing Slip,If more than one package of the same type (for print),Jeigu yra daugiau nei vienas paketas tos pačios rūšies (spausdinimui)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome įdiegti instruktoriaus pavadinimo sistemą švietime&gt; Švietimo nustatymai
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Nustatykite numatytąjį klientą Restoranų nustatymuose
 ,Salary Register,Pajamos Registruotis
 DocType: Company,Default warehouse for Sales Return,"Numatytasis sandėlis, skirtas pardavimui"
@@ -4954,7 +4945,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Kol veiklos
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Sukurkite laboratorijos testą
 DocType: Patient Appointment,Reminded,Primena
-DocType: Homepage Section,Cards,Kortelės
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Peržiūrėti sąskaitų schemą
 DocType: Chapter Member,Chapter Member,Skyrius narys
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimalus Užsakymo Kiekis
@@ -4972,7 +4962,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Ateities datos neleidžiamos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Laukiama pristatymo data turėtų būti pateikta po Pardavimų užsakymo data
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Pertvarkyti lygis
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Sąskaitų planas Šablonas
+DocType: Company,Chart Of Accounts Template,Sąskaitų planas Šablonas
 DocType: Attendance,Attendance Date,lankomumas data
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Įsigijimo sąskaita faktūrai {0} turi būti įgalinta atnaujinti vertybinius popierius
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Prekė Kaina atnaujintas {0} kainoraštis {1}
@@ -5541,8 +5531,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Dalinkis &quot;Ledger&quot;
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Sukurta pardavimo sąskaitą {0}
 DocType: Employee,Confirmation Date,Patvirtinimas data
-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","Ištrinkite darbuotoją <a href=""#Form/Employee/{0}"">{0}</a> \, kad galėtumėte atšaukti šį dokumentą"
 DocType: Inpatient Occupancy,Check Out,Patikrinkite
 DocType: C-Form,Total Invoiced Amount,Iš viso Sąskaitoje suma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Kiekis negali būti didesnis nei Max Kiekis
@@ -5751,7 +5739,6 @@
 DocType: Cheque Print Template,Cheque Width,Komunalinės Plotis
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Patvirtinti pardavimo kaina už prekę prieš Pirkimo rodikliu Vertinimo koeficientas
 DocType: Fee Schedule,Fee Schedule,mokestis Tvarkaraštis
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Stulpelių etiketės:
 DocType: Bank Transaction,Settled,Įsikūrė
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametrai
@@ -6435,6 +6422,7 @@
 DocType: Salary Component,Formula,formulė
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serijinis #
 DocType: Material Request Plan Item,Required Quantity,Reikalingas kiekis
+DocType: Cash Flow Mapping Template,Template Name,šablono pavadinimas
 DocType: Lab Test Template,Lab Test Template,Laboratorijos bandymo šablonas
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Apskaitos laikotarpis sutampa su {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Pardavimų sąskaita
@@ -6495,7 +6483,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,čekis data
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Sąskaita {0}: Tėvų sąskaitą {1} nepriklauso įmonės: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,"Sėkmingai ištrinta visus sandorius, susijusius su šios bendrovės!"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kaip ir data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kaip ir data
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Priėmimo data
 DocType: Healthcare Settings,Out Patient SMS Alerts,Išeina pacientų SMS perspėjimai
@@ -6561,7 +6549,6 @@
 DocType: Course Content,Quiz,Viktorina
 DocType: Subscription,Trial Period End Date,Bandymo pabaigos data
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ne authroized nuo {0} viršija ribas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Pradėkite įvesti duomenis iš čia:
 DocType: Serial No,Asset Status,Turto statusas
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Virš matmenų krovinių (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restorano stalas
@@ -6788,7 +6775,6 @@
 DocType: Contract,Party User,Partijos vartotojas
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Turtas nesukurtas <b>{0}</b> . Turtą turėsite sukurti rankiniu būdu.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Prašome nustatyti Įmonės filtruoti tuščias, jei Grupuoti pagal tai &quot;kompanija&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Siunčiamos data negali būti ateitis data
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Eilutės # {0}: Serijos Nr {1} nesutampa su {2} {3}
 DocType: Loan Repayment,Interest Payable,Mokėtinos palūkanos
@@ -7025,7 +7011,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Vidutinė norma
 DocType: Appointment,Appointment With,Skyrimas su
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Bendra mokėjimo suma mokėjimo grafike turi būti lygi Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Pažymėkite dalyvavimą kaip <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Užsakovo pateikiamas gaminys"" ne gali turėti vertinimo normos"
 DocType: Subscription Plan Detail,Plan,Suplanuoti
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Banko pažyma likutis vienam General Ledger
@@ -7720,7 +7705,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimalus darbuotojo naudos dydis {0} viršija {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Iš viso skiriami lapai yra daugiau nei laikotarpio dienų
 DocType: Linked Soil Analysis,Linked Soil Analysis,Susijusi dirvožemio analizė
-DocType: Pricing Rule,Percentage,procentas
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Prekė {0} turi būti akcijų punktas
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Numatytasis nebaigtos 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} sutapimų tvarkaraščiai, ar norite tęsti praleidę persidengusius laiko tarpsnius?"
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 94ede7d..4011d43 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Work In Progress
 DocType: Leave Control Panel,Branch (optional),Filiāle (pēc izvēles)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,"Lūdzu, izvēlieties datumu"
-DocType: Item Price,Minimum Qty ,Minimālais daudzums
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimālais daudzums
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM rekursija: {0} nevar būt {1} bērns
 DocType: Finance Book,Finance Book,Finanšu grāmata
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Brīvdienu saraksts
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Vecāka konts {0} neeksistē
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pārskats un darbība
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Šim darbiniekam jau ir žurnāls ar tādu pašu laika zīmogu. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Grāmatvedis
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Iegūt / zaudēt
 DocType: Crop,Perennial,Daudzgadīgs
 DocType: Program,Is Published,Tiek publicēts
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Rādīt piegādes piezīmes
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Lai atļautu rēķinu pārsniegšanu, kontu iestatījumos vai vienumā atjauniniet vienumu “Virs norēķinu piemaksa”."
 DocType: Patient Appointment,Procedure,Kārtība
 DocType: Accounts Settings,Use Custom Cash Flow Format,Izmantojiet pielāgotu naudas plūsmas formātu
@@ -984,7 +982,6 @@
 DocType: Patient,Risk Factors,Riska faktori
 DocType: Patient,Occupational Hazards and Environmental Factors,Darba vides apdraudējumi un vides faktori
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Rezerves ieraksti, kas jau ir izveidoti darba uzdevumā"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; Vienību grupa&gt; Zīmols
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Skatīt iepriekšējos pasūtījumus
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} sarunas
 DocType: Vital Signs,Respiratory rate,Elpošanas ātrums
@@ -1142,7 +1139,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Atjaunināšanas procesa laikā radās kļūda
 DocType: Restaurant Reservation,Restaurant Reservation,Restorāna rezervēšana
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Jūsu preces
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Priekšlikums Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Maksājumu Entry atskaitīšana
 DocType: Service Level Priority,Service Level Priority,Pakalpojuma līmeņa prioritāte
@@ -1443,7 +1439,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Lūdzu, izvēlieties Uzņēmums un Publicēšanas datums, lai saņemtu ierakstus"
 DocType: Asset,Maintenance,Uzturēšana
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Iegūstiet no pacientu sastopas
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Vienumam: {2} nav atrasts UOM konversijas koeficients ({0} -&gt; {1}).
 DocType: Subscriber,Subscriber,Abonents
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valūtas maiņa ir jāpiemēro pirkšanai vai pārdošanai.
@@ -1945,7 +1940,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Vai atdošana (debeta piezīme)
 DocType: Workstation,Wages,Alga
 DocType: Asset Maintenance,Maintenance Manager Name,Tehniskās apkopes vadītāja vārds
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Darījumi pret uzņēmumu jau pastāv!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Pieprasot vietni
 DocType: Agriculture Task,Urgent,Steidzams
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Notiek ierakstu iegūšana ......
@@ -2647,7 +2641,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,"Maksājuma termiņš rindā {0}, iespējams, ir dublikāts."
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Lauksaimniecība (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Iepakošanas Slip
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet nosaukšanas sēriju uz {0}, izmantojot Iestatīšana&gt; Iestatījumi&gt; Sēriju nosaukšana"
 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 vārti iestatījumi
 DocType: Disease,Common Name,Parastie vārdi
@@ -2814,7 +2807,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lapām Piešķirts Veiksmīgi par {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Nav Preces pack
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Pašlaik tiek atbalstīti tikai .csv un .xlsx faili
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, iestatiet Personāla nosaukšanas sistēma personāla resursos&gt; HR iestatījumi"
 DocType: Shipping Rule Condition,From Value,No vērtība
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
 DocType: Loan,Repayment Method,atmaksas metode
@@ -4071,7 +4063,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Nepieciešamais On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ja tas ir atzīmēts, paslēpj un atspējo lauku Noapaļots kopsummā Algas paslīdos"
 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.,Tas ir noklusējuma nobīde (dienas) piegādes datumam pārdošanas rīkojumos. Rezerves kompensācija ir 7 dienas pēc pasūtījuma veikšanas datuma.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, iestatiet apmeklējumu numerācijas sērijas, izmantojot Iestatīšana&gt; Numerācijas sērija"
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Ielādēt abonēšanas atjauninājumus
@@ -4676,7 +4667,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Ir finanšu izmaksas
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Apmeklējumu par darbiniekam {0} jau ir atzīmēts
 DocType: Packing Slip,If more than one package of the same type (for print),"Ja vairāk nekā viens iepakojums, no tā paša veida (drukāšanai)"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, iestatiet instruktora nosaukšanas sistēmu sadaļā Izglītība&gt; Izglītības iestatījumi"
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,"Lūdzu, iestatiet noklusējuma klientu restorāna iestatījumos"
 ,Salary Register,alga Reģistrēties
 DocType: Company,Default warehouse for Sales Return,Noklusējuma noliktava pārdošanas atgriešanai
@@ -4949,7 +4939,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Neapstiprinātas aktivitātes
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Izveidot lab testu
 DocType: Patient Appointment,Reminded,Atgādināts
-DocType: Homepage Section,Cards,Kartes
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Skatīt kontu grafiku
 DocType: Chapter Member,Chapter Member,Nodaļas loceklis
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimālais pasūtījuma daudzums
@@ -4967,7 +4956,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Nākotnes datumi nav atļauti
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Paredzētais piegādes datums jānosūta pēc pārdošanas pasūtījuma datuma
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Pārkārtot Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontu plāns Template
+DocType: Company,Chart Of Accounts Template,Kontu plāns Template
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},"Rēķina atjaunošanai jābūt iespējotam, lai iegādātos rēķinu {0}"
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Prece Cena atjaunināts {0} Cenrādī {1}
@@ -5536,8 +5525,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Akciju pārvaldnieks
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Tirdzniecības rēķins {0} izveidots
 DocType: Employee,Confirmation Date,Apstiprinājums Datums
-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","Lūdzu, izdzēsiet darbinieku <a href=""#Form/Employee/{0}"">{0}</a> \, lai atceltu šo dokumentu"
 DocType: Inpatient Occupancy,Check Out,Izbraukšana
 DocType: C-Form,Total Invoiced Amount,Kopā Rēķinā summa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Daudz nevar būt lielāks par Max Daudz
@@ -5746,7 +5733,6 @@
 DocType: Cheque Print Template,Cheque Width,Čeku platums
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Apstiprināt pārdošanas cena posteni pret pirkuma likmes vai vērtēšanas koeficients
 DocType: Fee Schedule,Fee Schedule,maksa grafiks
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolonnu etiķetes:
 DocType: Bank Transaction,Settled,Norēķinājies
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametri
@@ -6430,6 +6416,7 @@
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Sērijas #
 DocType: Material Request Plan Item,Required Quantity,Nepieciešamais daudzums
+DocType: Cash Flow Mapping Template,Template Name,Veidnes nosaukums
 DocType: Lab Test Template,Lab Test Template,Lab testēšanas veidne
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Grāmatvedības periods pārklājas ar {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Pārdošanas konts
@@ -6490,7 +6477,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kā datumā
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kā datumā
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Uzņemšanas datums
 DocType: Healthcare Settings,Out Patient SMS Alerts,Notiek pacientu SMS brīdinājumi
@@ -6556,7 +6543,6 @@
 DocType: Course Content,Quiz,Viktorīna
 DocType: Subscription,Trial Period End Date,Pārbaudes beigu datums
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ne authroized kopš {0} pārsniedz ierobežojumus
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Sāciet ievadīt datus no šejienes:
 DocType: Serial No,Asset Status,Aktīva statuss
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Virs izmēru kravas (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restorāna galds
@@ -6784,7 +6770,6 @@
 DocType: Contract,Party User,Partijas lietotājs
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,"Īpašumi, kas nav izveidoti <b>{0}</b> . Jums aktīvs būs jāizveido manuāli."
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Lūdzu noteikt Company filtrēt tukšu, ja Group By ir &quot;Uzņēmuma&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Norīkošanu datums nevar būt nākotnes datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
 DocType: Loan Repayment,Interest Payable,Maksājamie procenti
@@ -7021,7 +7006,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Vidējā likme
 DocType: Appointment,Appointment With,Iecelšana ar
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksājuma grafikam kopējam maksājuma summai jābūt vienādai ar Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Atzīmēt apmeklējumu kā <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",“Klienta nodrošinātam vienumam” nevar būt vērtēšanas pakāpe
 DocType: Subscription Plan Detail,Plan,Plānu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankas paziņojums bilance kā vienu virsgrāmatas
@@ -7717,7 +7701,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Darbinieka maksimālais pabalsta apmērs {0} pārsniedz {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Kopā piešķirtie lapas ir vairāk nekā dienu periodā
 DocType: Linked Soil Analysis,Linked Soil Analysis,Saistītā augsnes analīze
-DocType: Pricing Rule,Percentage,procentuālā attiecība
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Postenis {0} jābūt krājums punkts
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default nepabeigtie Noliktava
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Plānojumi {0} pārklājumiem, vai vēlaties turpināt pēc pārklājušo laika nišu izlaišanas?"
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 52c6248..3236e78 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -167,11 +167,10 @@
 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 @@
 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,Користете формат за прилагодени парични текови
@@ -976,7 +974,6 @@
 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 &gt; Item Group &gt; Brand,Код на точка&gt; Група на производи&gt; Бренд
 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,Респираторна стапка
@@ -1133,7 +1130,6 @@
 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 &gt; Supplier Type,Добавувач&gt; Тип на снабдувач
 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,Приоритет на ниво на услуга
@@ -1931,7 +1927,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Е Враќање (Дебитна белешка)
 DocType: Workstation,Wages,Плати
 DocType: Asset Maintenance,Maintenance Manager Name,Name Manager
-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......,Фаќање записи ......
@@ -2619,7 +2614,6 @@
 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 &gt; Settings &gt; Naming Series,Поставете Серија за именување за {0} преку Поставување&gt; Поставки&gt; Серии за именување
 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,Заедничко име
@@ -2784,7 +2778,6 @@
 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 &gt; HR Settings,Поставете го системот за именување на вработените во човечки ресурси&gt; Поставки за човечки ресурси
 DocType: Shipping Rule Condition,From Value,Од вредност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Производна количина е задолжително
 DocType: Loan,Repayment Method,Начин на отплата
@@ -4018,7 +4011,6 @@
 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 &gt; Numbering Series,Поставете серија за нумерирање за присуство преку Поставување&gt; Серии за нумерирање
 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,Земи ги ажурирањата на претплатата
@@ -4614,7 +4606,6 @@
 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 &gt; Education Settings,"Ве молиме, поставете Систем за именување на инструктори во образованието&gt; Поставки за образование"
 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,Стандарден магацин за поврат на продажба
@@ -4881,7 +4872,6 @@
 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,Минимална количина за нарачка
@@ -4898,7 +4888,7 @@
 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}
@@ -5461,8 +5451,6 @@
 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,Мин Количина не може да биде поголем од Макс Количина
@@ -5661,7 +5649,6 @@
 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,Параметри
@@ -6337,6 +6324,7 @@
 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,Вкупна тежина
@@ -6395,7 +6383,7 @@
 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
@@ -6460,7 +6448,6 @@
 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,Ресторан Табела
@@ -6680,7 +6667,6 @@
 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',Поставете компанијата филтер празно ако група од страна е &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,Камата што се плаќа
@@ -6915,7 +6901,6 @@
 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 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,"Извод од банка биланс, како на генералниот Леџер"
@@ -7593,7 +7578,6 @@
 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} се преклопува, дали сакате да продолжите по прескокнување на преклопени слотови?"
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index cb1aca4..bd98d52 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -165,7 +165,7 @@
 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,ഹോളിഡേ പട്ടിക
@@ -240,7 +240,6 @@
 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.","ഓവർ ബില്ലിംഗ് അനുവദിക്കുന്നതിന്, അക്കൗണ്ട് ക്രമീകരണങ്ങളിലോ ഇനത്തിലോ &quot;ഓവർ ബില്ലിംഗ് അലവൻസ്&quot; അപ്‌ഡേറ്റ് ചെയ്യുക."
 DocType: Patient Appointment,Procedure,നടപടിക്രമം
 DocType: Accounts Settings,Use Custom Cash Flow Format,കസ്റ്റം ക്യാഷ് ഫ്ലോ ഫോർമാറ്റ് ഉപയോഗിക്കുക
@@ -968,7 +967,6 @@
 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 &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 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 +1117,6 @@
 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 &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Proposal എഴുത്ത്
 DocType: Payment Entry Deduction,Payment Entry Deduction,പേയ്മെന്റ് എൻട്രി കിഴിച്ചുകൊണ്ടു
 DocType: Service Level Priority,Service Level Priority,സേവന നില മുൻ‌ഗണന
@@ -1416,7 +1413,6 @@
 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} -&gt; {1}) not found for item: {2},ഇനത്തിനായി UOM പരിവർത്തന ഘടകം ({0} -&gt; {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 +1902,6 @@
 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......,രേഖകൾ നേടുന്നു ......
@@ -2746,7 +2741,6 @@
 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 &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 DocType: Shipping Rule Condition,From Value,മൂല്യം നിന്നും
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
 DocType: Loan,Repayment Method,തിരിച്ചടവ് രീതി
@@ -3962,7 +3956,6 @@
 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 &gt; Numbering Series,സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി അറ്റൻഡൻസിനായി നമ്പറിംഗ് സീരീസ് സജ്ജമാക്കുക
 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} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,സബ്സ്ക്രിപ്ഷൻ അപ്ഡേറ്റുകൾ ലഭ്യമാക്കുക
@@ -4554,7 +4547,6 @@
 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 &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 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,സെയിൽസ് റിട്ടേണിനായുള്ള സ്ഥിര വെയർഹ house സ്
@@ -4820,7 +4812,6 @@
 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 +4827,7 @@
 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},ഇനത്തിന്റെ വില വില പട്ടിക {1} ൽ {0} അപ്ഡേറ്റുചെയ്തിട്ടുള്ളൂ
@@ -5392,8 +5383,6 @@
 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 വലുതായിരിക്കും കഴിയില്ല
@@ -5594,7 +5583,6 @@
 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,പാരാമീറ്ററുകൾ
@@ -6263,6 +6251,7 @@
 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,ആകെ ഭാരം
@@ -6321,7 +6310,7 @@
 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,രോഗിയുടെ എസ്എംഎസ് അലേർട്ടുകൾ
@@ -6386,7 +6375,6 @@
 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,റെസ്റ്റോറന്റ് ടേബിൾ
@@ -6606,7 +6594,6 @@
 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,നൽകേണ്ട പലിശ
@@ -6838,7 +6825,6 @@
 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,ജനറൽ ലെഡ്ജർ പ്രകാരം ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
@@ -7508,7 +7494,6 @@
 DocType: Item Customer Detail,Item Customer Detail,ഇനം ഉപഭോക്തൃ വിശദാംശം
 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} ഓവർലാപ്സ്, നിങ്ങൾ ഓവർലാപ് ചെയ്ത സ്ലോട്ടുകൾ ഒഴിവാക്കിയതിനുശേഷം തുടരണോ?"
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 7041a31..8da65a5 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -167,11 +167,10 @@
 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 @@
 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.",ओव्हर बिलिंगला परवानगी देण्यासाठी लेखा सेटिंग्ज किंवा आयटममध्ये &quot;ओव्हर बिलिंग अलाउन्स&quot; अद्यतनित करा.
 DocType: Patient Appointment,Procedure,कार्यपद्धती
 DocType: Accounts Settings,Use Custom Cash Flow Format,कस्टम कॅश फ्लो स्वरूप वापरा
@@ -974,7 +972,6 @@
 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 &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 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,श्वसन दर
@@ -1129,7 +1126,6 @@
 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 &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 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,सेवा स्तर प्राधान्य
@@ -1427,7 +1423,6 @@
 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} -&gt; {1}) not found for item: {2},आयटमसाठी यूओएम रूपांतरण घटक ({0} -&gt; {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.,चलन विनिमय खरेदी किंवा विक्रीसाठी लागू असणे आवश्यक आहे.
@@ -1926,7 +1921,6 @@
 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......,रेकॉर्ड आणत आहे ......
@@ -2774,7 +2768,6 @@
 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 &gt; HR Settings,मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Shipping Rule Condition,From Value,मूल्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
 DocType: Loan,Repayment Method,परतफेड पद्धत
@@ -4008,7 +4001,6 @@
 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 &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थितीसाठी क्रमांकन मालिका सेट करा
 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} मधे  आयटम साठी BOM निवडा
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,सदस्यता अद्यतने प्राप्त करा
@@ -4607,7 +4599,6 @@
 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 &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मधील इन्स्ट्रक्टर नामांकन प्रणाली सेट करा
 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,सेल्स रिटर्नसाठी डीफॉल्ट वेअरहाउस
@@ -4875,7 +4866,6 @@
 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,किमान मागणी प्रमाण
@@ -4892,7 +4882,7 @@
 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}
@@ -5455,8 +5445,6 @@
 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,एकूण Invoiced रक्कम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,किमान Qty कमाल Qty पेक्षा जास्त असू शकत नाही
@@ -5658,7 +5646,6 @@
 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,मापदंड
@@ -6332,6 +6319,7 @@
 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,एकूण वजन
@@ -6391,7 +6379,7 @@
 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,आउट रुग्ण एसएमएस अलर्ट
@@ -6456,7 +6444,6 @@
 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,रेस्टॉरन्ट टेबल
@@ -6677,7 +6664,6 @@
 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,व्याज देय
@@ -6911,7 +6897,6 @@
 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,सामान्य लेजर नुसार बँक स्टेटमेंट शिल्लक
@@ -7592,7 +7577,6 @@
 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} ओव्हरलॅप्सकरिता वेळापत्रक, आपण ओव्हरलॅप केलेले स्लॉट्स वगळल्यानंतर पुढे जायचे आहे का?"
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index d5bb6be..1c8cedd 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Kerja Dalam Kemajuan
 DocType: Leave Control Panel,Branch (optional),Cawangan (pilihan)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Sila pilih tarikh
-DocType: Item Price,Minimum Qty ,Qty Minimum
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Qty Minimum
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Kaedah BOM: {0} tidak boleh menjadi kanak-kanak {1}
 DocType: Finance Book,Finance Book,Buku Kewangan
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Senarai Holiday
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Akaun induk {0} tidak wujud
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Kajian dan Tindakan
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Pekerja ini sudah mempunyai log dengan timestamp yang sama. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Akauntan
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Keuntungan / Kerugian
 DocType: Crop,Perennial,Perennial
 DocType: Program,Is Published,Telah Diterbitkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Tunjukkan Nota Penghantaran
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Untuk membenarkan pengebilan, kemas kini &quot;Lebihan Elaun Penagihan&quot; dalam Tetapan Akaun atau Item."
 DocType: Patient Appointment,Procedure,Prosedur
 DocType: Accounts Settings,Use Custom Cash Flow Format,Gunakan Format Aliran Tunai Kastam
@@ -989,7 +987,6 @@
 DocType: Patient,Risk Factors,Faktor-faktor risiko
 DocType: Patient,Occupational Hazards and Environmental Factors,Bencana dan Faktor Alam Sekitar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Penyertaan Saham telah dibuat untuk Perintah Kerja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Lihat pesanan terdahulu
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,Perbualan {0}
 DocType: Vital Signs,Respiratory rate,Kadar pernafasan
@@ -1148,7 +1145,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Ralat berlaku semasa proses kemas kini
 DocType: Restaurant Reservation,Restaurant Reservation,Tempahan Restoran
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Item Anda
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Penulisan Cadangan
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Potongan Kemasukan
 DocType: Service Level Priority,Service Level Priority,Keutamaan Tahap Perkhidmatan
@@ -1451,7 +1447,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Sila pilih Syarikat dan Tarikh Penghantaran untuk mendapatkan entri
 DocType: Asset,Maintenance,Penyelenggaraan
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Dapatkan dari Pesakit Pesakit
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor penukaran UOM ({0} -&gt; {1}) tidak ditemui untuk item: {2}
 DocType: Subscriber,Subscriber,Pelanggan
 DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Pertukaran Mata Wang mesti terpakai untuk Beli atau Jual.
@@ -1953,7 +1948,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Adakah Pulangan (Nota Debit)
 DocType: Workstation,Wages,Upah
 DocType: Asset Maintenance,Maintenance Manager Name,Nama Pengurus Penyelenggaraan
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaksi terhadap syarikat sudah ada!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Meminta Tapak
 DocType: Agriculture Task,Urgent,Segera
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Mengambil rekod ......
@@ -2656,7 +2650,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Tempoh Bayaran pada baris {0} mungkin pendua.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Pertanian (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Slip pembungkusan
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Pejabat Disewa
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
 DocType: Disease,Common Name,Nama yang selalu digunakan
@@ -2823,7 +2816,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Meninggalkan Diperuntukkan Berjaya untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Tiada item untuk pek
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Hanya fail csv dan .xlsx yang disokong pada masa ini
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
 DocType: Loan,Repayment Method,Kaedah Bayaran Balik
@@ -4083,7 +4075,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Diperlukan Pada
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Jika disemak, menyembunyikan dan melumpuhkan bidang Bulat Total dalam Gaji Slip"
 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.,Ini adalah offset lalai (hari) untuk Tarikh Penghantaran di Pesanan Jualan. Offset sandaran adalah 7 hari dari tarikh penempatan pesanan.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Mengambil Update Langganan
@@ -4691,7 +4682,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Adakah Kos Kewangan
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih daripada satu bungkusan dari jenis yang sama (untuk cetak)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Sila tetapkan pelanggan lalai dalam Tetapan Restoran
 ,Salary Register,gaji Daftar
 DocType: Company,Default warehouse for Sales Return,Gudang lalai untuk Pulangan Jualan
@@ -4964,7 +4954,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Sementara menunggu Aktiviti
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Buat Ujian Makmal
 DocType: Patient Appointment,Reminded,Diingatkan
-DocType: Homepage Section,Cards,Kad
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Lihat Carta Akaun
 DocType: Chapter Member,Chapter Member,Ahli Bab
 DocType: Material Request Plan Item,Minimum Order Quantity,Kuantiti Pesanan Minima
@@ -4982,7 +4971,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Tarikh masa depan tidak dibenarkan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Tarikh Penghantaran yang Diharapkan hendaklah selepas Tarikh Pesanan Jualan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Pesanan semula Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Carta Of Akaun Template
+DocType: Company,Chart Of Accounts Template,Carta Of Akaun Template
 DocType: Attendance,Attendance Date,Kehadiran Tarikh
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Kemas kini stok mesti membolehkan invois belian {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Item Harga dikemaskini untuk {0} dalam Senarai Harga {1}
@@ -5553,8 +5542,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Kongsi Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Invois Jualan {0} dibuat
 DocType: Employee,Confirmation Date,Pengesahan Tarikh
-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","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Inpatient Occupancy,Check Out,Semak Keluar
 DocType: C-Form,Total Invoiced Amount,Jumlah Invois
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty tidak boleh lebih besar daripada Max Qty
@@ -5763,7 +5750,6 @@
 DocType: Cheque Print Template,Cheque Width,Lebar Cek
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Mengesahkan Harga Jualan bagi Item terhadap Kadar Pembelian atau Kadar Penilaian
 DocType: Fee Schedule,Fee Schedule,Jadual Bayaran
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Label lajur:
 DocType: Bank Transaction,Settled,Diselesaikan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parameter
@@ -6448,6 +6434,7 @@
 DocType: Salary Component,Formula,formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Kuantiti yang Diperlukan
+DocType: Cash Flow Mapping Template,Template Name,Nama template
 DocType: Lab Test Template,Lab Test Template,Templat Ujian Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Tempoh Perakaunan bertindih dengan {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Akaun Jualan
@@ -6508,7 +6495,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Seperti pada Tarikh
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Seperti pada Tarikh
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Tarikh pendaftaran
 DocType: Healthcare Settings,Out Patient SMS Alerts,Keluar daripada Pesakit SMS Pesakit
@@ -6574,7 +6561,6 @@
 DocType: Course Content,Quiz,Kuiz
 DocType: Subscription,Trial Period End Date,Tarikh Akhir Tempoh Percubaan
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Tidak authroized sejak {0} melebihi had
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Mula memasukkan data dari sini:
 DocType: Serial No,Asset Status,Status Aset
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Lebih dari Cargo Dimensi (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Jadual Restoran
@@ -6802,7 +6788,6 @@
 DocType: Contract,Party User,Pengguna Parti
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Aset tidak dibuat untuk <b>{0}</b> . Anda perlu membuat aset secara manual.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Sila tetapkan Syarikat menapis kosong jika Group By adalah &#39;Syarikat&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posting Tarikh tidak boleh tarikh masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
 DocType: Loan Repayment,Interest Payable,Faedah yang Dibayar
@@ -7039,7 +7024,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Kadar purata
 DocType: Appointment,Appointment With,Pelantikan Dengan
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Amaun Pembayaran dalam Jadual Pembayaran mestilah sama dengan Jumlah Besar / Bulat
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Tandatangan kehadiran sebagai <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Item yang Dibekalkan Pelanggan&quot; tidak boleh mempunyai Kadar Penilaian
 DocType: Subscription Plan Detail,Plan,Rancang
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Baki Penyata Bank seperti Lejar Am
@@ -7735,7 +7719,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Jumlah faedah maksimum pekerja {0} melebihi {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Jumlah daun diperuntukkan lebih daripada hari-hari dalam tempoh yang
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analisis Tanah yang Berkaitan
-DocType: Pricing Rule,Percentage,peratus
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Perkara {0} mestilah Perkara saham
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kerja Lalai Dalam Kemajuan Warehouse
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Jadual untuk {0} tumpang tindih, adakah anda mahu meneruskan selepas melangkau slot bergelombang?"
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index dbc7416..ddf95e3 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
 DocType: Leave Control Panel,Branch (optional),branch (optional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,ရက်စွဲကို select လုပ်ပါကျေးဇူးပြုပြီး
-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},ဒီအလုပျသမားပြီးသားအတူတူ Timestamp ကိုအတူမှတ်တမ်းရှိပါတယ်။ {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,စာရင်းကိုင်
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,အမြတ် / ပျောက်ဆုံးခြင်း
 DocType: Crop,Perennial,နှစ်ရှည်
 DocType: Program,Is Published,Published ဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Show ကို Delivery မှတ်စုများ
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","ငွေတောင်းခံကျော်ခွင့်ပြုပါရန်, Accounts ကိုချိန်ညှိမှုများ, သို့မဟုတ်အရာဝတ္ထုများတွင် &quot;Allow ငွေတောင်းခံခြင်းကျော်&quot; ကို update ။"
 DocType: Patient Appointment,Procedure,လုပ်ထုံးလုပ်နည်း
 DocType: Accounts Settings,Use Custom Cash Flow Format,စိတ်တိုင်းကျငွေ Flow Format ကိုသုံးပါ
@@ -989,7 +987,6 @@
 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 ,ပြီးသားသူ Work Order များအတွက် created စတော့အိတ် Entries
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ပစ္စည်းကုဒ်&gt; ပစ္စည်းအုပ်စု&gt; ကုန်အမှတ်တံဆိပ်
 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,အသက်ရှူလမ်းကြောင်းဆိုင်ရာမှုနှုန်း
@@ -1148,7 +1145,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,အမှား Update လုပ်တဲ့လုပ်ငန်းစဉ်အတွင်းဖြစ်ပွားခဲ့သည်
 DocType: Restaurant Reservation,Restaurant Reservation,စားသောက်ဆိုင် Reservation များ
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,သင့်ရဲ့ပစ္စည်းများ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ပေးသွင်းသူ&gt; ပေးသွင်းသူအမျိုးအစား
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,အဆိုပြုချက်ကို Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,ငွေပေးချေမှုရမည့် Entry ထုတ်ယူ
 DocType: Service Level Priority,Service Level Priority,ဝန်ဆောင်မှုအဆင့်ဦးစားပေး
@@ -1451,7 +1447,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,posts များလာပြီမှကုမ္ပဏီနှင့် Post date ကို select ပေးပါ
 DocType: Asset,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,လူနာတှေ့ဆုံထံမှ Get
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM ပြောင်းလဲခြင်းအချက် ({0} -&gt; {1}) ကိုရှာမတွေ့ပါ။ {2}
 DocType: Subscriber,Subscriber,စာရင်းပေးသွင်းသူ
 DocType: Item Attribute Value,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.,ငွေကြေးလဲလှယ်ရေးဝယ်ယူဘို့သို့မဟုတ်ရောင်းအားများအတွက်သက်ဆိုင်ဖြစ်ရမည်။
@@ -1953,7 +1948,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),သို့ပြန်သွားသည် (မြီစားမှတ်ချက်) ဖြစ်ပါသည်
 DocType: Workstation,Wages,လုပ်ခလစာ
 DocType: Asset Maintenance,Maintenance Manager Name,ကို Maintenance Manager ကိုအမည်
-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......,မှတ်တမ်းများကိုရယူနေ ......
@@ -2654,7 +2648,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,အတန်းမှာငွေပေးချေ Term {0} ဖြစ်နိုင်သည်တစ်ထပ်ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),စိုက်ပျိုးရေး (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 &gt; Settings &gt; Naming Series,ကျေးဇူးပြု၍ Setup&gt; Settings&gt; Naming Series မှ {0} အတွက် Naming Series ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
 DocType: Disease,Common Name,လူအသုံးအများဆုံးအမည်
@@ -2821,7 +2814,6 @@
 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 &gt; HR Settings,ကျေးဇူးပြု၍ လူ့စွမ်းအားအရင်းအမြစ်&gt; HR ဆက်တင်တွင် Employee Naming System ကိုထည့်သွင်းပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
 DocType: Loan,Repayment Method,ပြန်ဆပ် Method ကို
@@ -4076,7 +4068,6 @@
 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",Check လုပ်ပြီးပါကလစာဖြတ်ပိုင်းရှိ 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.,ဤသည်အရောင်းအမှာစာအတွက်ပေးပို့သည့်ရက်အတွက် default offset (days) ဖြစ်သည်။ အရံကျသည့် offset သည်အမှာစာချသည့်နေ့မှ ၇ ရက်ဖြစ်သည်။
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု၍ Setup&gt; Numbering Series မှတက်ရောက်လိုသူများအတွက်နံပါတ်စဉ်ဆက်တင်များကိုပြင်ဆင်ပါ
 DocType: Rename Tool,File to Rename,Rename မှ File
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Subscription အပ်ဒိတ်များဆွဲယူ
@@ -4683,7 +4674,6 @@
 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),(ပုံနှိပ်သည်) တူညီသောအမျိုးအစားတစ်ခုထက် ပို. package ကို အကယ်.
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ကျေးဇူးပြုပြီးပညာရေး&gt; ပညာရေးချိန်ညှိချက်များတွင်နည်းပြအမည်ပေးခြင်းစနစ်ကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,စားသောက်ဆိုင်က Settings ထဲမှာ default အနေနဲ့ဖောက်သည်သတ်မှတ်ပေးပါ
 ,Salary Register,လစာမှတ်ပုံတင်မည်
 DocType: Company,Default warehouse for Sales Return,အရောင်းပြန်သွားဘို့ default ဂိုဒေါင်
@@ -4956,7 +4946,6 @@
 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,Lab ကစမ်းသပ် Create
 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,အနိမ့်အမိန့်အရေအတွက်
@@ -4974,7 +4963,7 @@
 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,မျှော်လင့်ထားသည့် Delivery နေ့စွဲအရောင်းအမိန့်နေ့စွဲနောက်မှာဖြစ်သင့်ပါတယ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Reorder အဆင့်
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Accounts ကို Template ၏ဇယား
+DocType: Company,Chart Of Accounts Template,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} အဘို့ကို enable ရမည်ဖြစ်သည်
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},item စျေးစျေးစာရင်း {1} အတွက် {0} ဘို့ updated
@@ -5752,7 +5741,6 @@
 DocType: Cheque Print Template,Cheque Width,Cheque တစ်စောင်လျှင်အကျယ်
 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 : ,ကော်လံ Labels: ကဗျာ
 DocType: Bank Transaction,Settled,အခြေချ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,အခွန်
 DocType: Quality Feedback,Parameters,parameters
@@ -6437,6 +6425,7 @@
 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,template အမည်
 DocType: Lab Test Template,Lab Test Template,Lab ကစမ်းသပ် 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,အရောင်းအကောင့်
@@ -6497,7 +6486,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
 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 ကိုသတိပေးချက်ထွက်
@@ -6563,7 +6552,6 @@
 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 : ,ဒီကနေဒေတာတွေကိုဝင် Start:
 DocType: Serial No,Asset Status,ပိုင်ဆိုင်မှုအခြေအနေ
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),ကျော် Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,စားသောက်ဆိုင်ဇယား
@@ -6791,7 +6779,6 @@
 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> အတွက်ဖန်တီးမထားသည့်ပိုင်ဆိုင်မှုများ။ သငျသညျကို manually ပိုင်ဆိုင်မှုဖန်တီးရန်ရှိသည်လိမ့်မယ်။
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',အုပ်စုအားဖြင့် &#39;&#39; ကုမ္ပဏီ &#39;&#39; လျှင်အလွတ် filter ကုမ္ပဏီသတ်မှတ်ပေးပါ
-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,Post date အနာဂတ်နေ့စွဲမဖွစျနိုငျ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
 DocType: Loan Repayment,Interest Payable,ပေးဆောင်ရမည့်အတိုး
@@ -7028,7 +7015,6 @@
 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",&quot;ဖောက်သည်ပေး Item&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,အထွေထွေလယ်ဂျာနှုန်းအဖြစ် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
@@ -7724,7 +7710,6 @@
 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,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွက်ရက်ထက်ပိုပါတယ်
 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,item {0} တစ်စတော့ရှယ်ယာ Item ဖြစ်ရမည်
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,တိုးတက်ရေးပါတီဂိုဒေါင်ခုနှစ်တွင် Default အနေနဲ့သူ Work
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","{0} အတွက်အချိန်ဇယားထပ်နေသည်, သင်ထပ် slot နှစ်ခု skiping ပြီးနောက်ဆက်လက်ဆောင်ရွက်ရန်လိုသလဲ"
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 3a75f96..19dda5d 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Onderhanden Werk
 DocType: Leave Control Panel,Branch (optional),Branch (optioneel)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Kies een 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},BOM-recursie: {0} kan geen kind van {1} zijn
 DocType: Finance Book,Finance Book,Finance Book
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Holiday Lijst
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Het bovenliggende account {0} bestaat niet
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Beoordeling en actie
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Deze werknemer heeft al een logboek met hetzelfde tijdstempel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Winst / verlies
 DocType: Crop,Perennial,eeuwigdurend
 DocType: Program,Is Published,Is gepubliceerd
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Toon leveringsbonnen
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Als u overfacturering wilt toestaan, werkt u &quot;Overfactureringstoeslag&quot; bij in Accountinstellingen of het item."
 DocType: Patient Appointment,Procedure,Procedure
 DocType: Accounts Settings,Use Custom Cash Flow Format,Gebruik aangepaste kasstroomindeling
@@ -987,7 +985,6 @@
 DocType: Patient,Risk Factors,Risicofactoren
 DocType: Patient,Occupational Hazards and Environmental Factors,Beroepsgevaren en milieufactoren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Voorraadinvoer al gemaakt voor werkorder
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Bekijk eerdere bestellingen
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} gesprekken
 DocType: Vital Signs,Respiratory rate,Ademhalingsfrequentie
@@ -1146,7 +1143,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Er is een fout opgetreden tijdens het updateproces
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant reservering
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Uw artikelen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Voorstel Schrijven
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Aftrek
 DocType: Service Level Priority,Service Level Priority,Prioriteit serviceniveau
@@ -1448,7 +1444,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Selecteer Bedrijf en boekingsdatum om inzendingen te ontvangen
 DocType: Asset,Maintenance,Onderhoud
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Haal uit Patient Encounter
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-conversiefactor ({0} -&gt; {1}) niet gevonden voor item: {2}
 DocType: Subscriber,Subscriber,Abonnee
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valutawissel moet van toepassing zijn voor Kopen of Verkopen.
@@ -1967,7 +1962,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Is Return (Debet Note)
 DocType: Workstation,Wages,Loon
 DocType: Asset Maintenance,Maintenance Manager Name,Naam onderhoudsmanager
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transacties tegen het bedrijf bestaan al!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Verzoekende site
 DocType: Agriculture Task,Urgent,Dringend
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Records ophalen ...
@@ -2669,7 +2663,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,De betalingstermijn op rij {0} is mogelijk een duplicaat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Landbouw (bèta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakbon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in op {0} via Setup&gt; Instellingen&gt; 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,Instellingen SMS gateway
 DocType: Disease,Common Name,Gemeenschappelijke naam
@@ -2836,7 +2829,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Geen Artikelen om te verpakken
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Alleen .csv- en .xlsx-bestanden worden momenteel ondersteund
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel het naamgevingssysteem voor werknemers in via Human Resource&gt; HR-instellingen
 DocType: Shipping Rule Condition,From Value,Van Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
 DocType: Loan,Repayment Method,terugbetaling Method
@@ -4095,7 +4087,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Vereist op
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Indien aangevinkt, verbergt en schakelt het veld Afgerond totaal in salarisstroken uit"
 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 de standaard offset (dagen) voor de leverdatum in verkooporders. De reserve-terugval is 7 dagen vanaf de plaatsingsdatum van de bestelling.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringseries in voor Aanwezigheid via Setup&gt; Nummeringsseries
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Abonnementsupdates ophalen
@@ -4733,7 +4724,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Zijn financiële kosten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
 DocType: Packing Slip,If more than one package of the same type (for print),Als er meer dan een pakket van hetzelfde type (voor afdrukken)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het instructeursysteem in onder onderwijs&gt; onderwijsinstellingen
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Stel de standaardklant in in restaurantinstellingen
 ,Salary Register,salaris Register
 DocType: Company,Default warehouse for Sales Return,Standaard magazijn voor verkoopretour
@@ -5006,7 +4996,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Afwachting Activiteiten
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Maak een lab-test
 DocType: Patient Appointment,Reminded,herinnerd
-DocType: Homepage Section,Cards,Kaarten
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Bekijk rekeningschema
 DocType: Chapter Member,Chapter Member,Hoofdstuklid
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum bestelhoeveelheid
@@ -5024,7 +5013,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Toekomstige data niet toegestaan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Verwachte leveringsdatum moet na verkoopdatum zijn
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Bestelniveau
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Rekeningschema Template
+DocType: Company,Chart Of Accounts Template,Rekeningschema Template
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Voorraad bijwerken moet zijn ingeschakeld voor de inkoopfactuur {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Item Prijs bijgewerkt voor {0} in prijslijst {1}
@@ -5594,8 +5583,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Deel Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Verkoopfactuur {0} gemaakt
 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","Verwijder de werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om dit document te annuleren"
 DocType: Inpatient Occupancy,Check Out,Uitchecken
 DocType: C-Form,Total Invoiced Amount,Totaal Gefactureerd bedrag
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Aantal kan niet groter zijn dan Max Aantal zijn
@@ -5804,7 +5791,6 @@
 DocType: Cheque Print Template,Cheque Width,Cheque Breedte
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Valideren verkoopprijs voor post tegen Purchase Rate of Valuation Rate
 DocType: Fee Schedule,Fee Schedule,fee Schedule
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolomlabels:
 DocType: Bank Transaction,Settled,verrekend
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,parameters
@@ -6489,6 +6475,7 @@
 DocType: Salary Component,Formula,Formule
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Benodigde hoeveelheid
+DocType: Cash Flow Mapping Template,Template Name,Sjabloonnaam
 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},Boekhoudperiode overlapt met {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Verkoopaccount
@@ -6549,7 +6536,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Op Date
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Op Date
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,inschrijfdatum
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS Alerts
@@ -6615,7 +6602,6 @@
 DocType: Course Content,Quiz,Quiz
 DocType: Subscription,Trial Period End Date,Einddatum van de proefperiode
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Niet toegestaan aangezien {0} grenzen overschrijdt
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Begin met het invoeren van gegevens vanaf hier:
 DocType: Serial No,Asset Status,Activumstatus
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurant tafel
@@ -6844,7 +6830,6 @@
 DocType: Contract,Party User,Partijgebruiker
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Activa niet gemaakt voor <b>{0}</b> . U moet het activum handmatig maken.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Stel alsjeblieft Bedrijfsfilter leeg als Group By is &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posting datum kan niet de toekomst datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
 DocType: Loan Repayment,Interest Payable,Verschuldigde rente
@@ -7079,7 +7064,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Gemiddelde score
 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,Het totale betalingsbedrag in het betalingsschema moet gelijk zijn aan het groot / afgerond totaal
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Markeer aanwezigheid als <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&#39;Door de klant verstrekt artikel&#39; kan geen waarderingspercentage hebben
 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,Bankafschrift saldo per General Ledger
@@ -7774,7 +7758,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maximaal voordeelbedrag van werknemer {0} overschrijdt {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Totaal toegewezen bladeren zijn meer dan dagen in de periode
 DocType: Linked Soil Analysis,Linked Soil Analysis,Linked Soil Analysis
-DocType: Pricing Rule,Percentage,Percentage
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Artikel {0} moet een voorraadartikel zijn
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard 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 ?","Plannen voor overlappende {0}, wilt u doorgaan na het overslaan van overlappende slots?"
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 497a364..5235c11 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Arbeid På Går
 DocType: Leave Control Panel,Branch (optional),Gren (valgfritt)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Vennligst velg dato
-DocType: Item Price,Minimum Qty ,Minimum antall
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimum antall
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekursjon for BOM: {0} kan ikke være barn av {1}
 DocType: Finance Book,Finance Book,Finansbok
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Holiday List
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Foreldrekontoen {0} eksisterer ikke
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Gjennomgang og handling
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Denne ansatte har allerede en logg med samme tidsstempel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Gevinst / tap
 DocType: Crop,Perennial,Flerårig
 DocType: Program,Is Published,Publiseres
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Vis leveringsmerknader
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","For å tillate overfakturering, oppdater &quot;Over Billing Allowance&quot; i Kontoinnstillinger eller elementet."
 DocType: Patient Appointment,Procedure,Fremgangsmåte
 DocType: Accounts Settings,Use Custom Cash Flow Format,Bruk tilpasset kontantstrømformat
@@ -989,7 +987,6 @@
 DocType: Patient,Risk Factors,Risikofaktorer
 DocType: Patient,Occupational Hazards and Environmental Factors,Arbeidsfare og miljøfaktorer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Lageroppføringer allerede opprettet for arbeidsordre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Merke
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Se tidligere bestillinger
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} samtaler
 DocType: Vital Signs,Respiratory rate,Respirasjonsfrekvens
@@ -1148,7 +1145,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Det oppsto en feil under oppdateringsprosessen
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurantreservasjon
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Varene dine
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
 DocType: Service Level Priority,Service Level Priority,Servicenivåprioritet
@@ -1451,7 +1447,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Vennligst velg Company og Posting Date for å få oppføringer
 DocType: Asset,Maintenance,Vedlikehold
 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} -&gt; {1}) not found for item: {2},UOM konverteringsfaktor ({0} -&gt; {1}) ikke funnet for varen: {2}
 DocType: Subscriber,Subscriber,abonnent
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valutaveksling må gjelde for kjøp eller salg.
@@ -1953,7 +1948,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Er retur (Debit Note)
 DocType: Workstation,Wages,Lønn
 DocType: Asset Maintenance,Maintenance Manager Name,Vedlikeholdsansvarlig navn
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaksjoner mot selskapet eksisterer allerede!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Ber om nettsted
 DocType: Agriculture Task,Urgent,Haster
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Henter poster ......
@@ -2656,7 +2650,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Betalingsperioden i rad {0} er muligens en duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Jordbruk (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakkseddel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Angi Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 DocType: Disease,Common Name,Vanlig navn
@@ -2823,7 +2816,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Ingenting å pakke
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Bare .csv- og .xlsx-filer støttes for øyeblikket
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sett inn ansattes navnsystem i menneskelige ressurser&gt; HR-innstillinger
 DocType: Shipping Rule Condition,From Value,Fra Verdi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
 DocType: Loan,Repayment Method,tilbakebetaling Method
@@ -4079,7 +4071,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Nødvendig På
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Hvis det er merket, skjuler og deaktiverer du avrundet totalfelt i lønnsslipper"
 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 standard forskyvningen (dager) for leveringsdatoen i salgsordrer. Tilbakeførsel er 7 dager fra bestillingsdato.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Angi nummereringsserier for Oppmøte via Oppsett&gt; Nummereringsserier
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Hent abonnementsoppdateringer
@@ -4686,7 +4677,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Er finansieringskostnad
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vennligst konfigurer Instruktør Namning System i Utdanning&gt; Utdanningsinnstillinger
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Vennligst sett standardkunden i Restaurantinnstillinger
 ,Salary Register,lønn Register
 DocType: Company,Default warehouse for Sales Return,Standard lager for salgsavkastning
@@ -4959,7 +4949,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Lag Lab Test
 DocType: Patient Appointment,Reminded,minnet
-DocType: Homepage Section,Cards,kort
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Se diagram over kontoer
 DocType: Chapter Member,Chapter Member,Kapittelmedlem
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum antall
@@ -4977,7 +4966,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Fremtidige datoer ikke tillatt
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Forventet leveringsdato bør være etter salgsordre
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Omgjøre nivå
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Konto Mal
+DocType: Company,Chart Of Accounts Template,Konto Mal
 DocType: Attendance,Attendance Date,Oppmøte Dato
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Oppdateringslager må være aktivert for kjøpsfakturaen {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
@@ -5546,8 +5535,6 @@
 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} opprettet
 DocType: Employee,Confirmation Date,Bekreftelse Dato
-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","Slett ansatt <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
 DocType: Inpatient Occupancy,Check Out,Sjekk ut
 DocType: C-Form,Total Invoiced Amount,Total Fakturert beløp
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Antall kan ikke være større enn Max Antall
@@ -5756,7 +5743,6 @@
 DocType: Cheque Print Template,Cheque Width,sjekk Bredde
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validere salgspris for varen mot Purchase Rate Verdivurdering Ranger
 DocType: Fee Schedule,Fee Schedule,Prisliste
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolonnetiketter:
 DocType: Bank Transaction,Settled,Bosatte seg
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,parametere
@@ -6441,6 +6427,7 @@
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Nødvendig mengde
+DocType: Cash Flow Mapping Template,Template Name,Malnavn
 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},Regnskapsperioden overlapper med {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Salgskonto
@@ -6501,7 +6488,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
-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,påmelding Dato
 DocType: Healthcare Settings,Out Patient SMS Alerts,Ut Patient SMS Alerts
@@ -6567,7 +6554,6 @@
 DocType: Course Content,Quiz,quiz
 DocType: Subscription,Trial Period End Date,Prøveperiode Sluttdato
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Begynn å legge inn data herfra:
 DocType: Serial No,Asset Status,Asset Status
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over dimensjonell last (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurantbord
@@ -6794,7 +6780,6 @@
 DocType: Contract,Party User,Festbruker
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Eiendeler ikke opprettet for <b>{0}</b> . Du må opprette aktiva manuelt.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Vennligst sett Company filter blank 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,Publiseringsdato kan ikke være fremtidig dato
 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} samsvarer ikke med {2} {3}
 DocType: Loan Repayment,Interest Payable,Betalbar rente
@@ -7029,7 +7014,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Gjennomsnittlig rente
 DocType: Appointment,Appointment With,Avtale med
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totalt betalingsbeløp i betalingsplan må være lik Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merk oppmøte som <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Kunden gitt varen&quot; kan ikke ha verdsettelsesgrad
 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,Kontoutskrift balanse pr hovedbok
@@ -7723,7 +7707,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimal ytelsesbeløp for ansatt {0} overstiger {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
 DocType: Linked Soil Analysis,Linked Soil Analysis,Koblet jordanalyse
-DocType: Pricing Rule,Percentage,Prosentdel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Elementet {0} må være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard 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 ?","Tidsplaner for {0} overlapper, vil du fortsette etter å ha hoppet over overlapte spor?"
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 897be54..8221122 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Produkty w toku
 DocType: Leave Control Panel,Branch (optional),Oddział (opcjonalnie)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Proszę wybrać datę
-DocType: Item Price,Minimum Qty ,Minimalna ilość
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimalna ilość
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekurs BOM: {0} nie może być dzieckiem {1}
 DocType: Finance Book,Finance Book,Książka finansowa
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Lista Świąt
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Konto nadrzędne {0} nie istnieje
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Recenzja i działanie
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ten pracownik ma już dziennik z tym samym znacznikiem czasu. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Księgowy
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Zysk / strata
 DocType: Crop,Perennial,Bylina
 DocType: Program,Is Published,Jest opublikowany
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Pokaż dowody dostawy
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Aby zezwolić na rozliczenia, zaktualizuj „Over Billing Allowance” w ustawieniach kont lub pozycji."
 DocType: Patient Appointment,Procedure,Procedura
 DocType: Accounts Settings,Use Custom Cash Flow Format,Użyj niestandardowego formatu przepływu środków pieniężnych
@@ -989,7 +987,6 @@
 DocType: Patient,Risk Factors,Czynniki ryzyka
 DocType: Patient,Occupational Hazards and Environmental Factors,Zagrożenia zawodowe i czynniki środowiskowe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Wpisy magazynowe już utworzone dla zlecenia pracy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Zobacz poprzednie zamówienia
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} rozmów
 DocType: Vital Signs,Respiratory rate,Oddechowy
@@ -1148,7 +1145,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Wystąpił błąd podczas procesu aktualizacji
 DocType: Restaurant Reservation,Restaurant Reservation,Rezerwacja restauracji
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Twoje przedmioty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dostawca&gt; Rodzaj dostawcy
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Pisanie Wniosku
 DocType: Payment Entry Deduction,Payment Entry Deduction,Płatność Wejście Odliczenie
 DocType: Service Level Priority,Service Level Priority,Priorytet poziomu usług
@@ -1451,7 +1447,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Wybierz Firmę i Data księgowania, aby uzyskać wpisy"
 DocType: Asset,Maintenance,Konserwacja
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Uzyskaj od spotkania pacjenta
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Nie znaleziono współczynnika konwersji UOM ({0} -&gt; {1}) dla elementu: {2}
 DocType: Subscriber,Subscriber,Abonent
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Wymiana walut musi dotyczyć Kupowania lub Sprzedaży.
@@ -1972,7 +1967,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Jest zwrotem (nota debetowa)
 DocType: Workstation,Wages,Zarobki
 DocType: Asset Maintenance,Maintenance Manager Name,Nazwa menedżera konserwacji
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakcje przeciwko firmie już istnieją!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Strona żądająca
 DocType: Agriculture Task,Urgent,Pilne
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Pobieranie rekordów ......
@@ -2675,7 +2669,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Termin płatności w wierszu {0} jest prawdopodobnie duplikatem.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Rolnictwo (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,List przewozowy
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serie nazw dla {0} poprzez Ustawienia&gt; Ustawienia&gt; Serie nazw
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
 DocType: Disease,Common Name,Nazwa zwyczajowa
@@ -2842,7 +2835,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Nieobecności Przedzielono z Powodzeniem dla {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Brak Przedmiotów do pakowania
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Aktualnie obsługiwane są tylko pliki .csv i .xlsx
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Skonfiguruj system nazewnictwa pracowników w dziale Zasoby ludzkie&gt; Ustawienia HR
 DocType: Shipping Rule Condition,From Value,Od wartości
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa
 DocType: Loan,Repayment Method,Sposób spłaty
@@ -4102,7 +4094,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Wymagane na
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Jeśli zaznaczone, ukrywa i wyłącza pole Zaokrąglona suma w kuponach wynagrodzeń"
 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.,Jest to domyślne przesunięcie (dni) dla daty dostawy w zamówieniach sprzedaży. Przesunięcie awaryjne wynosi 7 dni od daty złożenia zamówienia.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Skonfiguruj serie numeracji dla frekwencji poprzez Ustawienia&gt; Serie numeracji
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Pobierz aktualizacje subskrypcji
@@ -4742,7 +4733,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Koszt finansowy
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
 DocType: Packing Slip,If more than one package of the same type (for print),Jeśli więcej niż jedna paczka tego samego typu (do druku)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Skonfiguruj system nazewnictwa instruktorów w sekcji Edukacja&gt; Ustawienia edukacji
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Ustaw domyślnego klienta w Ustawieniach restauracji
 ,Salary Register,wynagrodzenie Rejestracja
 DocType: Company,Default warehouse for Sales Return,Domyślny magazyn dla zwrotu sprzedaży
@@ -5015,7 +5005,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Oczekujące Inne
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Utwórz test laboratoryjny
 DocType: Patient Appointment,Reminded,Przypomnij
-DocType: Homepage Section,Cards,Karty
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Zobacz plan kont
 DocType: Chapter Member,Chapter Member,Członek rozdziału
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimalna ilość zamówienia
@@ -5033,7 +5022,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Przyszłe daty są niedozwolone
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Oczekiwana data dostarczenia powinna nastąpić po Dacie Zamówienia Sprzedaży
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Poziom Uporządkowania
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Szablon planu kont
+DocType: Company,Chart Of Accounts Template,Szablon planu kont
 DocType: Attendance,Attendance Date,Data usługi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Aktualizuj zapasy musi być włączone dla faktury zakupu {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1}
@@ -5603,8 +5592,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Udostępnij księgę
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Utworzono fakturę sprzedaży {0}
 DocType: Employee,Confirmation Date,Data potwierdzenia
-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","Usuń pracownika <a href=""#Form/Employee/{0}"">{0}</a> \, aby anulować ten dokument"
 DocType: Inpatient Occupancy,Check Out,Sprawdzić
 DocType: C-Form,Total Invoiced Amount,Całkowita zafakturowana kwota
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Minimalna ilość nie może być większa niż maksymalna Ilość
@@ -5813,7 +5800,6 @@
 DocType: Cheque Print Template,Cheque Width,Czek Szerokość
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Weryfikacja Selling Price for element przeciwko Zakup lub wycena Oceń
 DocType: Fee Schedule,Fee Schedule,Harmonogram opłat
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Etykiety kolumn:
 DocType: Bank Transaction,Settled,Osiadły
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametry
@@ -6498,6 +6484,7 @@
 DocType: Salary Component,Formula,Formuła
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seryjny #
 DocType: Material Request Plan Item,Required Quantity,Wymagana ilość
+DocType: Cash Flow Mapping Template,Template Name,Nazwa szablonu
 DocType: Lab Test Template,Lab Test Template,Szablon testu laboratoryjnego
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Okres rozliczeniowy pokrywa się z {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Konto sprzedaży
@@ -6558,7 +6545,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,W sprawie daty
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,W sprawie daty
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Data rejestracji
 DocType: Healthcare Settings,Out Patient SMS Alerts,Wypisuj alerty SMS dla pacjentów
@@ -6624,7 +6611,6 @@
 DocType: Course Content,Quiz,Kartkówka
 DocType: Subscription,Trial Period End Date,Termin zakończenia okresu próbnego
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Brak autoryzacji od {0} przekroczono granice
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Zacznij wprowadzać dane tutaj:
 DocType: Serial No,Asset Status,Status zasobu
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Ponad wymiarowe ładunki (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Stolik Restauracyjny
@@ -6853,7 +6839,6 @@
 DocType: Contract,Party User,Użytkownik strony
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Zasoby nie zostały utworzone dla <b>{0}</b> . Będziesz musiał utworzyć zasób ręcznie.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Proszę wyłączyć filtr firmy, jeśli Group By jest &quot;Company&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Data publikacji nie może być datą przyszłą
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
 DocType: Loan Repayment,Interest Payable,Odsetki płatne
@@ -7090,7 +7075,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Średnia Stawka
 DocType: Appointment,Appointment With,Spotkanie z
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Całkowita kwota płatności w harmonogramie płatności musi być równa sumie całkowitej / zaokrąglonej
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Oznacz obecność jako <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Element dostarczony przez klienta"" nie może mieć wskaźnika wyceny"
 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,Bilans wyciągów bankowych wedle Księgi Głównej
@@ -7786,7 +7770,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksymalna kwota świadczenia pracownika {0} przekracza {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Liczba przyznanych zwolnień od pracy jest większa niż dni w okresie
 DocType: Linked Soil Analysis,Linked Soil Analysis,Powiązana analiza gleby
-DocType: Pricing Rule,Percentage,Odsetek
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Item {0} musi być dostępna w magazynie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie 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 ?","Harmonogramy nakładek {0}, czy chcesz kontynuować po przejściu przez zakładki?"
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 027a917..d2de258 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -164,12 +164,11 @@
 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,محاسب
@@ -240,7 +239,6 @@
 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.",د بلینګ څخه اجازه ورکولو لپاره ، د حسابونو ترتیباتو یا توکي کې &quot;د اضافي بلینګ الاونس&quot; تازه کړئ.
 DocType: Patient Appointment,Procedure,کړنلاره
 DocType: Accounts Settings,Use Custom Cash Flow Format,د ګمرکي پیسو فلو فارم څخه کار واخلئ
@@ -968,7 +966,6 @@
 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 &gt; Item Group &gt; Brand,د توکي کوډ&gt; د توکي ګروپ&gt; نښه
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,تیرې سپارښتنې وګورئ
 DocType: Vital Signs,Respiratory rate,د تناسب کچه
 apps/erpnext/erpnext/config/help.py,Managing Subcontracting,د اداره کولو په ټیکه
@@ -1123,7 +1120,6 @@
 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 &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
 DocType: Service Level Priority,Service Level Priority,د خدمت کچې لومړیتوب
@@ -1422,7 +1418,6 @@
 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} -&gt; {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -&gt; {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.,د پیسو تبادله باید د اخیستلو یا خرڅلاو لپاره تطبیق شي.
@@ -1917,7 +1912,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),بیرته راستنیدنه (د 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,Urgent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,د ریکارډونو راوړل ......
@@ -2769,7 +2763,6 @@
 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 &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; 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,دبيرته طريقه
@@ -4001,7 +3994,6 @@
 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.,دا د پلور امرونو کې د تحویلي نیټې لپاره لومړنۍ آفسیټ (ورځې) دي. د فالباک آفسیټ د سپارلو له نیټې څخه days ورځې دی.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; 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,د ترلاسه کولو تازه راپورونه
@@ -4594,7 +4586,6 @@
 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 &gt; 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,د پلور بیرته راتګ لپاره اصلي ګودام
@@ -4861,7 +4852,6 @@
 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,د کم تر لږه اندازه
@@ -4878,7 +4868,7 @@
 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}
@@ -5438,8 +5428,6 @@
 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,Total رسیدونو د مقدار
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty نه شي کولای Max Qty څخه ډيره وي
@@ -5642,7 +5630,6 @@
 DocType: Cheque Print Template,Cheque Width,آرډر پلنوالي
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,د رانيول نرخ يا ارزښت Rate په وړاندې د قالب اعتبار د پلورنې بیه
 DocType: Fee Schedule,Fee Schedule,فیس مهال ويش
-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,پیرامیټرې
@@ -6318,6 +6305,7 @@
 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,ټول وزن
@@ -6377,7 +6365,7 @@
 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}: Parent حساب {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,د ناروغۍ ایس ایم ایل خبرتیاوې
@@ -6442,7 +6430,6 @@
 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),د Dimensional کارګو څخه زیات (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,د رستورانت میز
@@ -6666,7 +6653,6 @@
 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',لطفا جوړ شرکت چاڼ خالي که ډله په دی شرکت
-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,سود ورکول
@@ -6900,7 +6886,6 @@
 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,بانک اعلامیه سلنه له بلونو په توګه انډول
@@ -7579,7 +7564,6 @@
 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,Default د کار په پرمختګ ګدام
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",د {0} تاوان لپاره شیډولونه، ایا تاسو غواړئ چې د اوپلو شویو سلایډونو د سکپ کولو وروسته پرمخ ولاړ شئ؟
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 00a577d..8d855e5 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Trabalho em Andamento
 DocType: Leave Control Panel,Branch (optional),Filial (opcional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Por favor selecione a data
-DocType: Item Price,Minimum Qty ,Qtd mínimo
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Qtd mínimo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Recursão da BOM: {0} não pode ser filho de {1}
 DocType: Finance Book,Finance Book,Livro de finanças
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Lista de Feriados
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,A conta pai {0} não existe
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisão e ação
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Este funcionário já possui um log com o mesmo timestamp. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contabilista
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Ganho / Perda
 DocType: Crop,Perennial,Perene
 DocType: Program,Is Published,Está 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 o excesso de faturamento, atualize o &quot;Over the Billing Allowance&quot; em Accounts Settings ou no Item."
 DocType: Patient Appointment,Procedure,Procedimento
 DocType: Accounts Settings,Use Custom Cash Flow Format,Use o formato de fluxo de caixa personalizado
@@ -989,7 +987,6 @@
 DocType: Patient,Risk Factors,Fatores de risco
 DocType: Patient,Occupational Hazards and Environmental Factors,Perigos ocupacionais e fatores ambientais
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entradas de ações já criadas para ordem de serviço
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Veja pedidos anteriores
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} conversas
 DocType: Vital Signs,Respiratory rate,Frequência respiratória
@@ -1147,7 +1144,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Ocorreu um erro durante o processo de atualização
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurante
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Seus itens
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Elaboração de Proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Dedução de Registo de Pagamento
 DocType: Service Level Priority,Service Level Priority,Prioridade de Nível de Serviço
@@ -1446,7 +1442,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Por favor, selecione Empresa e Data de Lançamento para obter as inscrições"
 DocType: Asset,Maintenance,Manutenção
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Obter do Encontro do Paciente
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fator de conversão de UOM ({0} -&gt; {1}) não encontrado para o item: {2}
 DocType: Subscriber,Subscriber,Assinante
 DocType: Item Attribute Value,Item Attribute Value,Valor do Atributo do Item
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Câmbio deve ser aplicável para compra ou venda.
@@ -1966,7 +1961,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),É retorno (nota de débito)
 DocType: Workstation,Wages,Salários
 DocType: Asset Maintenance,Maintenance Manager Name,Nome do gerente de manutenção
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transações contra a empresa já existem!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Solicitando Site
 DocType: Agriculture Task,Urgent,Urgente
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Buscando registros ......
@@ -2667,7 +2661,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,O termo de pagamento na linha {0} é possivelmente uma duplicata.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Agricultura (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Nota Fiscal
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series como {0} em Configuração&gt; Configurações&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Alugar Escritório
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Configurar definições de portal de SMS
 DocType: Disease,Common Name,Nome comum
@@ -2834,7 +2827,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Licenças Atribuídas Com Sucesso para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Sem Itens para embalar
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Somente arquivos .csv e .xlsx são suportados atualmente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o sistema de nomeação de funcionários em Recursos humanos&gt; Configurações de RH
 DocType: Shipping Rule Condition,From Value,Valor De
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,É obrigatório colocar a Quantidade de Fabrico
 DocType: Loan,Repayment Method,Método de reembolso
@@ -4095,7 +4087,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Necessário Em
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Se marcado, oculta e desativa o campo Arredondado total em boletins de salários"
 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.,Esse é o deslocamento padrão (dias) para a Data de entrega em pedidos de venda. O deslocamento de fallback é de 7 dias a partir da data de colocação do pedido.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure séries de numeração para Presença em Configuração&gt; Série de numeração
 DocType: Rename Tool,File to Rename,Ficheiro para Alterar Nome
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Por favor, selecione uma LDM para o Item na Linha {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Buscar atualizações de assinatura
@@ -4734,7 +4725,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,O custo das finanças
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Já foi registada a presença do funcionário {0}
 DocType: Packing Slip,If more than one package of the same type (for print),Se houver mais do que um pacote do mesmo tipo (por impressão)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure o Sistema de Nomenclatura do Instrutor em Educação&gt; Configurações da Educação
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Defina o cliente padrão em Configurações do restaurante
 ,Salary Register,salário Register
 DocType: Company,Default warehouse for Sales Return,Depósito padrão para devolução de vendas
@@ -5007,7 +4997,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Atividades Pendentes
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Criar teste de laboratório
 DocType: Patient Appointment,Reminded,Lembrado
-DocType: Homepage Section,Cards,Postais
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Visualizar gráfico de contas
 DocType: Chapter Member,Chapter Member,Membro do capítulo
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantidade mínima de pedido
@@ -5025,7 +5014,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Datas futuras não permitidas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Data de entrega esperada deve ser após a data da ordem de venda
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Reordenar Nível
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Modelo de Plano de Contas
+DocType: Company,Chart Of Accounts Template,Modelo de Plano de Contas
 DocType: Attendance,Attendance Date,Data de Presença
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Atualizar estoque deve ser ativado para a fatura de compra {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},O Preço do Item foi atualizado para {0} na Lista de Preços {1}
@@ -5595,8 +5584,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Fatura de vendas {0} criada
 DocType: Employee,Confirmation Date,Data de Confirmação
-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","Por favor, exclua o funcionário <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Inpatient Occupancy,Check Out,Confira
 DocType: C-Form,Total Invoiced Amount,Valor total faturado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,A Qtd Mín. não pode ser maior do que a Qtd Máx.
@@ -5805,7 +5792,6 @@
 DocType: Cheque Print Template,Cheque Width,Largura do Cheque
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar Preço de Venda para o Item na Taxa de Compra ou Taxa de Avaliação
 DocType: Fee Schedule,Fee Schedule,Cronograma de Propinas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Rótulos da Coluna:
 DocType: Bank Transaction,Settled,Liquidado
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parâmetros
@@ -6489,6 +6475,7 @@
 DocType: Salary Component,Formula,Fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Série #
 DocType: Material Request Plan Item,Required Quantity,Quantidade requerida
+DocType: Cash Flow Mapping Template,Template Name,Nome do modelo
 DocType: Lab Test Template,Lab Test Template,Modelo de teste de laboratório
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Período de Contabilidade sobrepõe-se a {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Conta de vendas
@@ -6549,7 +6536,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},A Conta {0}: da Conta Principal {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Todas as transacções relacionadas com esta empresa foram eliminadas com sucesso!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Igual à Data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Igual à Data
 DocType: Additional Salary,HR,RH
 DocType: Course Enrollment,Enrollment Date,Data de Matrícula
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alertas de SMS para pacientes
@@ -6615,7 +6602,6 @@
 DocType: Course Content,Quiz,Questionário
 DocType: Subscription,Trial Period End Date,Data de término do período de avaliação
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Não está autorizado pois {0} excede os limites
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Comece a inserir dados aqui:
 DocType: Serial No,Asset Status,Status do Ativo
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Sobre Carga Dimensional (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Mesa de restaurante
@@ -6844,7 +6830,6 @@
 DocType: Contract,Party User,Usuário da festa
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Ativos não criados para <b>{0}</b> . Você precisará criar um ativo manualmente.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Defina o filtro de empresa em branco se Group By for &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Território
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,A Data de Postagem não pode ser uma data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Linha # {0}: O Nr. de Série {1} não corresponde a {2} {3}
 DocType: Loan Repayment,Interest Payable,Juros a pagar
@@ -7081,7 +7066,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Taxa média
 DocType: Appointment,Appointment With,Compromisso com
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,O valor total do pagamento no cronograma de pagamento deve ser igual a total / total arredondado
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcar presença como <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Item Fornecido pelo Cliente&quot; não pode ter Taxa de Avaliação
 DocType: Subscription Plan Detail,Plan,Plano
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Declaração Bancária de Saldo de acordo com a Razão Geral
@@ -7783,7 +7767,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},O valor máximo de benefício do empregado {0} excede {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,O total de licenças atribuídas são superiores aoss dias desse período
 DocType: Linked Soil Analysis,Linked Soil Analysis,Análise de solo associada
-DocType: Pricing Rule,Percentage,Percentagem
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,O Item {0} deve ser um Item de stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Armazém de Trabalho em Progresso Padrão
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Programações para sobreposições {0}, você deseja prosseguir após ignorar os slots sobrepostos?"
diff --git a/erpnext/translations/pt_br.csv b/erpnext/translations/pt_br.csv
index e44eace..b3cda38 100644
--- a/erpnext/translations/pt_br.csv
+++ b/erpnext/translations/pt_br.csv
@@ -2377,7 +2377,7 @@
 apps/erpnext/erpnext/accounts/party.py,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Avg. Selling Rate,Valor Médio de Venda
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py,Total Target,Meta Total
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Como na Data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Como na Data
 apps/erpnext/erpnext/config/accounts.py,Setup Gateway accounts.,Configuração contas Gateway.
 DocType: Sales Team,Contact No.,Nº Contato.
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index a99c723..128045a 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Lucrări în curs
 DocType: Leave Control Panel,Branch (optional),Sucursală (opțional)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Vă rugăm să selectați data
-DocType: Item Price,Minimum Qty ,Cantitatea minimă
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Cantitatea minimă
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Recurs recurs BOM: {0} nu poate fi copil de {1}
 DocType: Finance Book,Finance Book,Cartea de finanțe
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Lista de Vacanță
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Contul părinte {0} nu există
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revizuire și acțiune
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Acest angajat are deja un jurnal cu aceeași oră de timp. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contabil
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Gain / Pierdere
 DocType: Crop,Perennial,peren
 DocType: Program,Is Published,Este publicat
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Afișare note de livrare
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Pentru a permite facturarea excesivă, actualizați „Indemnizație de facturare” în Setări conturi sau element."
 DocType: Patient Appointment,Procedure,Procedură
 DocType: Accounts Settings,Use Custom Cash Flow Format,Utilizați formatul fluxului de numerar personalizat
@@ -989,7 +987,6 @@
 DocType: Patient,Risk Factors,Factori de Risc
 DocType: Patient,Occupational Hazards and Environmental Factors,Riscuri Ocupaționale și Factori de Mediu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Înregistrări stoc deja create pentru comanda de lucru
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cod articol&gt; Grup de articole&gt; Marcă
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Vezi comenzile anterioare
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} conversații
 DocType: Vital Signs,Respiratory rate,Rata respiratorie
@@ -1148,7 +1145,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,A apărut o eroare în timpul procesului de actualizare
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervare la restaurant
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Articolele dvs.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizor&gt; Tip furnizor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Propunere de scriere
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plată Deducerea intrare
 DocType: Service Level Priority,Service Level Priority,Prioritate la nivel de serviciu
@@ -1450,7 +1446,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Selectați Company and Dateing date pentru a obține înregistrări
 DocType: Asset,Maintenance,Mentenanţă
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Ia de la întâlnirea cu pacienții
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factorul de conversie UOM ({0} -&gt; {1}) nu a fost găsit pentru articol: {2}
 DocType: Subscriber,Subscriber,Abonat
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Cursul valutar trebuie să fie aplicabil pentru cumpărare sau pentru vânzare.
@@ -1971,7 +1966,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Este Return (Nota de debit)
 DocType: Workstation,Wages,Salarizare
 DocType: Asset Maintenance,Maintenance Manager Name,Nume Manager Mentenanță
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Tranzacțiile cu compania există deja!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Solicitarea site-ului
 DocType: Agriculture Task,Urgent,De urgență
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Recuperarea înregistrărilor ......
@@ -2675,7 +2669,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,"Termenul de plată la rândul {0} este, eventual, 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,Slip de ambalare
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Naming Series pentru {0} prin Setare&gt; Setări&gt; Serie pentru denumire
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
 DocType: Disease,Common Name,Denumire Comună
@@ -2843,7 +2836,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Nu sunt produse în ambalaj
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,"În prezent, numai fișierele .csv și .xlsx sunt acceptate"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să configurați sistemul de numire a angajaților în resurse umane&gt; Setări HR
 DocType: Shipping Rule Condition,From Value,Din Valoare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
 DocType: Loan,Repayment Method,Metoda de rambursare
@@ -4102,7 +4094,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Cerut pe
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Dacă este bifat, ascunde și dezactivează câmpul total rotunjit din Slips-uri de salariu"
 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.,Aceasta este compensarea implicită (zile) pentru data livrării în comenzile de vânzare. Decalarea compensării este de 7 zile de la data plasării comenzii.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru prezență prin Setare&gt; Numerotare
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Actualizați abonamentul la preluare
@@ -4740,7 +4731,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Este costul de finanțare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
 DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație&gt; Setări educație
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Alegeți clientul implicit în Setări restaurant
 ,Salary Register,Salariu Înregistrare
 DocType: Company,Default warehouse for Sales Return,Depozit implicit pentru returnarea vânzărilor
@@ -5013,7 +5003,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Activități în curs
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Creați un test de laborator
 DocType: Patient Appointment,Reminded,Reamintit
-DocType: Homepage Section,Cards,Carduri
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Vezi Diagramă de Conturi
 DocType: Chapter Member,Chapter Member,Membru de capitol
 DocType: Material Request Plan Item,Minimum Order Quantity,Cantitatea minima pentru comanda
@@ -5031,7 +5020,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Datele viitoare nu sunt permise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Data de livrare preconizată trebuie să fie după data de comandă de vânzare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Nivel pentru re-comanda
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Diagramă de Șablon Conturi
+DocType: Company,Chart Of Accounts Template,Diagramă de Șablon Conturi
 DocType: Attendance,Attendance Date,Dată prezenţă
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Actualizați stocul trebuie să fie activat pentru factura de achiziție {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Articol Preț actualizat pentru {0} în lista de prețuri {1}
@@ -5601,8 +5590,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Împărțiți Registru Contabil
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Factura de vânzări {0} a fost creată
 DocType: Employee,Confirmation Date,Data de Confirmare
-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","Vă rugăm să ștergeți angajatul <a href=""#Form/Employee/{0}"">{0}</a> \ pentru a anula acest document"
 DocType: Inpatient Occupancy,Check Out,Verifică
 DocType: C-Form,Total Invoiced Amount,Sumă totală facturată
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Cantitate nu poate fi mai mare decât Max Cantitate
@@ -5811,7 +5798,6 @@
 DocType: Cheque Print Template,Cheque Width,Lățime Cec
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validați Prețul de vânzare pentru postul contra Purchase Rate sau Rata de evaluare
 DocType: Fee Schedule,Fee Schedule,Taxa de Program
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Etichete coloane:
 DocType: Bank Transaction,Settled,Stabilit
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,CESS
 DocType: Quality Feedback,Parameters,Parametrii
@@ -6496,6 +6482,7 @@
 DocType: Salary Component,Formula,Formulă
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Cantitatea necesară
+DocType: Cash Flow Mapping Template,Template Name,Numele de șablon
 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},Perioada de contabilitate se suprapune cu {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Cont de vânzări
@@ -6556,7 +6543,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Dată Cec
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Ca pe data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Ca pe data
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Data de inscriere
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alerte SMS ale pacientului
@@ -6622,7 +6609,6 @@
 DocType: Course Content,Quiz,chestionare
 DocType: Subscription,Trial Period End Date,Data de încheiere a perioadei de încercare
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Nu authroized din {0} depășește limitele
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Începeți să introduceți date de aici:
 DocType: Serial No,Asset Status,Starea activelor
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Peste mărime dimensională (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Masă Restaurant
@@ -6851,7 +6837,6 @@
 DocType: Contract,Party User,Utilizator de petreceri
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Activele nu au fost create pentru <b>{0}</b> . Va trebui să creați activ manual.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Filtru filtru de companie gol dacă grupul de grup este &quot;companie&quot;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriul
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Dată postare nu poate fi data viitoare
 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} nu se potrivește cu {2} {3}
 DocType: Loan Repayment,Interest Payable,Dobândi de plătit
@@ -7087,7 +7072,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Rata medie
 DocType: Appointment,Appointment With,Programare cu
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Suma totală de plată în Planul de Plăți trebuie să fie egală cu Total / Rotunjit
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcați prezența ca <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Elementul furnizat de client"" nu poate avea rata de evaluare"
 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,Banca echilibru Declarație pe General Ledger
@@ -7784,7 +7768,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Suma maximă a beneficiilor angajatului {0} depășește {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,TOTAL frunze alocate sunt mai mult decât zile în perioada
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analiza solului conectat
-DocType: Pricing Rule,Percentage,Procent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Implicit Lucrări în depozit Progress
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Programări pentru suprapunerile {0}, doriți să continuați după ce ați sări peste sloturile suprapuse?"
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 7bae65b..b579e7e 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -168,12 +168,11 @@
 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},Рекурсия спецификации: {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 @@
 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,Использовать формат пользовательского денежного потока
@@ -989,7 +987,6 @@
 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 &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 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,Частота дыхания
@@ -1148,7 +1145,6 @@
 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 &gt; Supplier Type,Поставщик&gt; Тип поставщика
 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,Приоритет уровня обслуживания
@@ -1450,7 +1446,6 @@
 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,Получите от Patient Encounter
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коэффициент преобразования UOM ({0} -&gt; {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.,Обмен валюты должен применяться для покупки или продажи.
@@ -1971,7 +1966,6 @@
 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......,Получение записей ......
@@ -2672,7 +2666,6 @@
 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 &gt; Settings &gt; Naming Series,"Пожалуйста, установите серию имен для {0} через Настройка&gt; Настройки&gt; Серия имен"
 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,Распространенное имя
@@ -2838,7 +2831,6 @@
 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 &gt; HR Settings,"Пожалуйста, настройте систему имен сотрудников в разделе «Управление персоналом»&gt; «Настройки 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,Способ погашения
@@ -4099,7 +4091,6 @@
 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 &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для Посещаемости через Настройка&gt; Серия нумерации"
 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,Получение обновлений подписки
@@ -4736,7 +4727,6 @@
 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 &gt; Education Settings,"Пожалуйста, настройте систему имен инструкторов в «Образование»&gt; «Настройки образования»"
 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,Склад по умолчанию для возврата товара
@@ -5009,7 +4999,6 @@
 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,Минимум для заказа
@@ -5027,7 +5016,7 @@
 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}
@@ -5597,8 +5586,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,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,"Мин Кол-во не может быть больше, чем максимальное Кол-во"
@@ -5807,7 +5794,6 @@
 DocType: Cheque Print Template,Cheque Width,Cheque Ширина
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Подтвердить цена продажи пункта против купли-продажи или оценки Rate 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,параметры
@@ -6490,6 +6476,7 @@
 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,Сбыт
@@ -6550,7 +6537,7 @@
 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 для пациентов
@@ -6616,7 +6603,6 @@
 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),Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Стол для ресторанов
@@ -6845,7 +6831,6 @@
 DocType: Contract,Party User,Пользователь Party
 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',"Пожалуйста, установите фильтр компании blank, если Group By является «Company»"
-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,Проценты к выплате
@@ -7082,7 +7067,6 @@
 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 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,Банк балансовый отчет за Главную книгу
@@ -7777,7 +7761,6 @@
 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} перекрываются, вы хотите продолжить после пропусков перекрытых слотов?"
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index af65205..43b9766 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -165,7 +165,7 @@
 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 ,අවම වශයෙන් 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,නිවාඩු ලැයිස්තුව
@@ -240,7 +240,6 @@
 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,අභිමත මුදල් ප්රවාහ ආකෘතිය භාවිතා කරන්න
@@ -966,7 +965,6 @@
 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 &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතම සමූහය&gt; වෙළඳ නාමය
 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 +1115,6 @@
 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 &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 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,සේවා මට්ටමේ ප්‍රමුඛතාවය
@@ -1415,7 +1412,6 @@
 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,Patient Encounter වෙතින් ලබාගන්න
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},අයිතමය සඳහා UOM පරිවර්තන සාධකය ({0} -&gt; {1}) හමු නොවීය: {2}
 DocType: Subscriber,Subscriber,ග්රාහකයා
 DocType: Item Attribute Value,Item Attribute Value,අයිතමය Attribute අගය
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,විනිමය හෝ විකිණීම සඳහා මුදල් හුවමාරුව අදාළ විය යුතුය.
@@ -1913,7 +1909,6 @@
 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......,වාර්තා ලබා ගැනීම ......
@@ -2757,7 +2752,6 @@
 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 &gt; HR Settings,කරුණාකර සේවක නම් කිරීමේ පද්ධතිය මානව සම්පත්&gt; මානව සම්පත් සැකසුම් තුළ සකසන්න
 DocType: Shipping Rule Condition,From Value,අගය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,නිෂ්පාදන ප්රමාණය අනිවාර්ය වේ
 DocType: Loan,Repayment Method,ණය ආපසු ගෙවීමේ ක්රමය
@@ -3985,7 +3979,6 @@
 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 &gt; Numbering Series,කරුණාකර පැමිණීම සඳහා අංකනය කිරීමේ ශ්‍රේණිය සැකසුම&gt; අංකනය මාලාව හරහා සකසන්න
 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,අනුගාමිකයන් යාවත්කාලීන කිරීම්
@@ -4579,7 +4572,6 @@
 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 &gt; Education Settings,කරුණාකර අධ්‍යාපන&gt; අධ්‍යාපන සැකසුම් තුළ උපදේශක නම් කිරීමේ පද්ධතිය සකසන්න
 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,විකුණුම් ප්‍රතිලාභ සඳහා පෙරනිමි ගබඩාව
@@ -4844,7 +4836,6 @@
 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,අවම ඇණවුම් ප්රමාණය
@@ -4860,7 +4851,7 @@
 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},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} සඳහා නවීකරණය
@@ -5419,8 +5410,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share ලෙජරය
 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,මුළු ඉන්වොයිස් මුදල
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,යි යවන ලද මැක්ස් යවන ලද වඩා වැඩි විය නොහැකි
@@ -5624,7 +5613,6 @@
 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,පරාමිතීන්
@@ -6298,6 +6286,7 @@
 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,සම්පූර්ණ බර
@@ -6356,7 +6345,7 @@
 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,Patient SMS Alerts වෙතින්
@@ -6420,7 +6409,6 @@
 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),Dimensionional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,ආපනශාලා වගුව
@@ -6641,7 +6629,6 @@
 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,පොලී ගෙවිය යුතු
@@ -6873,7 +6860,6 @@
 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,පොදු ලෙජරය අනුව බැංකු ප්රකාශය ඉතිරි
@@ -7547,7 +7533,6 @@
 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} සඳහා උපලේඛන වැරදියි, ඔබට අතිරික්ත ආවරණ මඟ හැරීමෙන් පසු ඉදිරියට යාමට අවශ්යද?"
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index ca82354..117c09f 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Work in Progress
 DocType: Leave Control Panel,Branch (optional),Pobočka (voliteľné)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,"Prosím, vyberte dátum"
-DocType: Item Price,Minimum Qty ,Minimálny počet
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimálny počet
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekurzia kusovníka: {0} nemôže byť dieťaťom z {1}
 DocType: Finance Book,Finance Book,Finančná kniha
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Dovolená Seznam
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Materský účet {0} neexistuje
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Preskúmanie a konanie
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Tento zamestnanec už má denník s rovnakou časovou pečiatkou. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Účtovník
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Zisk / strata
 DocType: Crop,Perennial,trvalka
 DocType: Program,Is Published,Publikované
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Zobraziť dodacie listy
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Ak chcete povoliť nadmernú fakturáciu, aktualizujte položku „Príspevok na fakturáciu“ v nastaveniach účtov alebo v položke."
 DocType: Patient Appointment,Procedure,procedúra
 DocType: Accounts Settings,Use Custom Cash Flow Format,Použiť formát vlastného toku peňazí
@@ -989,7 +987,6 @@
 DocType: Patient,Risk Factors,Rizikové faktory
 DocType: Patient,Occupational Hazards and Environmental Factors,Pracovné nebezpečenstvo a environmentálne faktory
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Zápisy už boli vytvorené pre pracovnú objednávku
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Zobraziť minulé objednávky
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} konverzácií
 DocType: Vital Signs,Respiratory rate,Dýchacia frekvencia
@@ -1148,7 +1145,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Počas procesu aktualizácie sa vyskytla chyba
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervácia reštaurácie
 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 &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukcie
 DocType: Service Level Priority,Service Level Priority,Priorita na úrovni služby
@@ -1449,7 +1445,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Zvoľte Spoločnosť a dátum odoslania na zadanie záznamov
 DocType: Asset,Maintenance,Údržba
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Získajte od stretnutia s pacientmi
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Prepočítavací faktor UOM ({0} -&gt; {1}) nenájdený pre položku: {2}
 DocType: Subscriber,Subscriber,predplatiteľ
 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.,Výmena peňazí musí byť uplatniteľná pri kúpe alebo predaji.
@@ -1969,7 +1964,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Je Return (Debit Note)
 DocType: Workstation,Wages,Mzdy
 DocType: Asset Maintenance,Maintenance Manager Name,Meno správcu údržby
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakcie proti spoločnosti už existujú!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Žiadajúci web
 DocType: Agriculture Task,Urgent,Naléhavý
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Prebieha načítavanie záznamov ......
@@ -2673,7 +2667,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Platobný termín na riadku {0} je pravdepodobne duplicitný.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Poľnohospodárstvo (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,List k balíku
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím pomenujte Series pre {0} cez Setup&gt; Settings&gt; 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,Nastavenie SMS brány
 DocType: Disease,Common Name,Spoločný názov
@@ -2840,7 +2833,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {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,Momentálne sú podporované iba súbory .csv a .xlsx
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte systém pomenovávania zamestnancov v časti Ľudské zdroje&gt; Nastavenia ľudských zdrojov
 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žstvo je povinné
 DocType: Loan,Repayment Method,splácanie Method
@@ -4101,7 +4093,6 @@
 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","Ak je toto políčko začiarknuté, skryje a zakáže pole Zaokrúhlený celkový počet v mzdových listoch"
 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 predvolený ofset (dni) pre Dátum dodania v zákazkách odberateľa. Náhradný odstup je 7 dní od dátumu zadania objednávky.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovaciu sériu pre účasť cez Nastavenie&gt; Číslovacie série
 DocType: Rename Tool,File to Rename,Súbor premenovať
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Načítať aktualizácie odberov
@@ -4740,7 +4731,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Sú 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 &gt; Education Settings,Nastavte Pomenovací systém inštruktorov v časti Vzdelanie&gt; Nastavenia vzdelávania
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Nastavte štandardný zákazník v nastaveniach reštaurácie
 ,Salary Register,plat Register
 DocType: Company,Default warehouse for Sales Return,Predvolený sklad pre vrátenie predaja
@@ -5013,7 +5003,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Nevybavené Aktivity
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Vytvoriť laboratórny test
 DocType: Patient Appointment,Reminded,pripomenul
-DocType: Homepage Section,Cards,karty
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Zobraziť účtovnú schému
 DocType: Chapter Member,Chapter Member,Člen kapitoly
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimálna objednávka
@@ -5031,7 +5020,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Budúce termíny nie sú povolené
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Očakávaný dátum doručenia by mal byť po dátume zákazky predaja
 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,Šablóna účtovného rozvrhu
+DocType: Company,Chart Of Accounts Template,Šablóna účtovného rozvrhu
 DocType: Attendance,Attendance Date,Účast Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Ak chcete aktualizovať nákupnú faktúru {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Položka Cena aktualizovaný pre {0} v Cenníku {1}
@@ -5602,8 +5591,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Zdieľať knihu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Faktúra predaja {0} bola vytvorená
 DocType: Employee,Confirmation Date,Dátum potvrdenia
-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","Ak chcete tento dokument zrušiť, odstráňte zamestnanca <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Inpatient Occupancy,Check Out,Odhlásiť sa
 DocType: C-Form,Total Invoiced Amount,Celková fakturovaná čiastka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min množstvo nemôže byť väčšie ako Max množstvo
@@ -5812,7 +5799,6 @@
 DocType: Cheque Print Template,Cheque Width,šek Šírka
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Overenie predajná cena výtlačku proti platbe alebo ocenenia Rate
 DocType: Fee Schedule,Fee Schedule,poplatok Plán
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Štítky stĺpcov:
 DocType: Bank Transaction,Settled,usadil
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,parametre
@@ -6495,6 +6481,7 @@
 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žstvo
+DocType: Cash Flow Mapping Template,Template Name,Názov šablóny
 DocType: Lab Test Template,Lab Test Template,Šablóna testu laboratória
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Účtovné obdobie sa prekrýva s {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Predajný účet
@@ -6555,7 +6542,7 @@
 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!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Rovnako ako u Date
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Rovnako ako u Date
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,zápis Dátum
 DocType: Healthcare Settings,Out Patient SMS Alerts,SMS upozorňovanie na pacientov
@@ -6621,7 +6608,6 @@
 DocType: Course Content,Quiz,kvíz
 DocType: Subscription,Trial Period End Date,Dátum ukončenia skúšobného obdobia
 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čnite zadávať údaje odtiaľto:
 DocType: Serial No,Asset Status,Stav majetku
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Rozmerový náklad (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Reštaurácia Tabuľka
@@ -6850,7 +6836,6 @@
 DocType: Contract,Party User,Používateľ strany
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Diela neboli vytvorené pre <b>{0}</b> . Prvok budete musieť vytvoriť ručne.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Filtrovanie spoločnosti nastavte prázdne, ak je položka Skupina pod skupinou &quot;Spoločnosť&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníkov&gt; Územie
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Vysielanie dátum nemôže byť budúci dátum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
 DocType: Loan Repayment,Interest Payable,Splatný úrok
@@ -7087,7 +7072,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Priemerná hodnota
 DocType: Appointment,Appointment With,Schôdzka s
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková čiastka platby v pláne platieb sa musí rovnať veľkému / zaokrúhlenému súčtu
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označiť účasť ako <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",„Položka poskytovaná zákazníkom“ nemôže mať mieru ocenenia
 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,Bankový zostatok podľa hlavnej knihy
@@ -7784,7 +7768,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maximálna výška dávky zamestnanca {0} presahuje {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Celkové pridelené listy sú viac ako dní v období
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analýza prepojenej pôdy
-DocType: Pricing Rule,Percentage,percento
 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ýchodiskové prácu v sklade 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 pre prekrytie {0}, chcete pokračovať po preskočení prekryvných pozícií?"
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index eabbe3f..bf4f9f8 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Delo v teku
 DocType: Leave Control Panel,Branch (optional),Podružnica (neobvezno)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Izberite datum
-DocType: Item Price,Minimum Qty ,Najmanjša količina
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Najmanjša 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 more biti otrok od {1}
 DocType: Finance Book,Finance Book,Finance knjiga
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.GGGG.-
 DocType: Appointment Booking Settings,Holiday List,Seznam praznikov
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Nadrejeni račun {0} ne obstaja
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pregled in ukrepanje
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ta zaposleni že ima dnevnik z istim časovnim žigom. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovodja
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Dobiček / izguba
 DocType: Crop,Perennial,Trajen
 DocType: Program,Is Published,Je objavljeno
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Pokaži dobavnice
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Če želite omogočiti preveč zaračunavanja, posodobite »Nadomestitev za obračunavanje« v nastavitvah računov ali postavke."
 DocType: Patient Appointment,Procedure,Postopek
 DocType: Accounts Settings,Use Custom Cash Flow Format,Uporabite obliko prilagojenega denarnega toka
@@ -988,7 +986,6 @@
 DocType: Patient,Risk Factors,Dejavniki tveganja
 DocType: Patient,Occupational Hazards and Environmental Factors,Poklicne nevarnosti in dejavniki okolja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Zaloge, ki so že bile ustvarjene za delovno nalogo"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda izdelka&gt; Skupina izdelkov&gt; Blagovna znamka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Glej pretekla naročila
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} pogovori
 DocType: Vital Signs,Respiratory rate,Stopnja dihanja
@@ -1147,7 +1144,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Pri postopku posodabljanja je prišlo do napake
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restavracij
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Predmeti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelja
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Predlog Pisanje
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plačilo Začetek odštevanja
 DocType: Service Level Priority,Service Level Priority,Prednostna raven storitve
@@ -1450,7 +1446,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,"Prosimo, izberite Podjetje in Datum objave, da vnesete vnose"
 DocType: Asset,Maintenance,Vzdrževanje
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Pojdite iz srečanja s pacientom
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije za UOM ({0} -&gt; {1}) za element: {2}
 DocType: Subscriber,Subscriber,Naročnik
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Menjalnica mora veljati za nakup ali prodajo.
@@ -1951,7 +1946,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Je povračilo (obvestilo o obremenitvi)
 DocType: Workstation,Wages,Plače
 DocType: Asset Maintenance,Maintenance Manager Name,Ime upravitelja vzdrževanja
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakcije s podjetjem že obstajajo!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,"Spletno mesto, ki zaprosi"
 DocType: Agriculture Task,Urgent,Nujna
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Pridobivanje zapisov ......
@@ -2653,7 +2647,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Izraz plačila v vrstici {0} je morda dvojnik.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Kmetijstvo (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakiranje listek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Nastavitve Setup SMS gateway
 DocType: Disease,Common Name,Pogosto ime
@@ -2820,7 +2813,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Ni prispevkov 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 so podprte samo datoteke .csv in .xlsx
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovskem sektorju&gt; Nastavitve človeških virov"
 DocType: Shipping Rule Condition,From Value,Od vrednosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
 DocType: Loan,Repayment Method,Povračilo Metoda
@@ -4078,7 +4070,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Zahtevani Na
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Če je označeno, se v plačah zakriva in onemogoči polje Zaokroženo skupno"
 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.,To je privzeti odmik (dni) za datum dostave v prodajnih nalogah. Nadomestilo nadomestitve je 7 dni od datuma oddaje naročila.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup&gt; Numbering Series
 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},Izberite BOM za postavko v vrstici {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Prenesi posodobitve naročnine
@@ -4685,7 +4676,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Je strošek financiranja
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju&gt; Nastavitve za izobraževanje
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Privzeto stran nastavite v nastavitvah restavracij
 ,Salary Register,plača Registracija
 DocType: Company,Default warehouse for Sales Return,Privzeto skladišče za vračilo prodaje
@@ -4958,7 +4948,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Čakanju Dejavnosti
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Ustvari laboratorijski test
 DocType: Patient Appointment,Reminded,Opomniti
-DocType: Homepage Section,Cards,Karte
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Oglejte si Chart of Accounts
 DocType: Chapter Member,Chapter Member,Član poslanke
 DocType: Material Request Plan Item,Minimum Order Quantity,Najmanjša količina naročila
@@ -4976,7 +4965,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Prihodnji datumi niso dovoljeni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Pričakovani rok dobave je po datumu prodajnega naročila
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Preureditev Raven
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Graf Of predlogo računov
+DocType: Company,Chart Of Accounts Template,Graf Of predlogo računov
 DocType: Attendance,Attendance Date,Udeležba Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Posodobitev zaloge mora biti omogočena za račun za nakup {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Kos Cena posodabljati za {0} v ceniku {1}
@@ -5544,8 +5533,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Delež knjige
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Ustvarjen je račun za prodajo {0}
 DocType: Employee,Confirmation Date,Datum potrditve
-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","Prosimo, da izbrišete zaposlenega <a href=""#Form/Employee/{0}"">{0}</a> \, če želite preklicati ta dokument"
 DocType: Inpatient Occupancy,Check Out,Preveri
 DocType: C-Form,Total Invoiced Amount,Skupaj Obračunani znesek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Količina ne sme biti večja od Max Kol
@@ -5754,7 +5741,6 @@
 DocType: Cheque Print Template,Cheque Width,Ček Širina
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Potrdite prodajna cena za postavko proti Nakup mero ali vrednotenja
 DocType: Fee Schedule,Fee Schedule,Razpored Fee
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Oznake stolpcev:
 DocType: Bank Transaction,Settled,Naseljeni
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametri
@@ -6438,6 +6424,7 @@
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Zahtevana količina
+DocType: Cash Flow Mapping Template,Template Name,Predloga Ime
 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},Računovodsko obdobje se prekriva z {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Prodajni račun
@@ -6498,7 +6485,7 @@
 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}: Matični račun {1} ne pripada podjetju: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kot na datum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kot na datum
 DocType: Additional Salary,HR,Človeški viri
 DocType: Course Enrollment,Enrollment Date,Datum včlanitve
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS Opozorila
@@ -6564,7 +6551,6 @@
 DocType: Course Content,Quiz,Kviz
 DocType: Subscription,Trial Period End Date,Končni datum poskusnega obdobja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje"
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Začnite vnašati podatke od tukaj:
 DocType: Serial No,Asset Status,Stanje sredstev
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Nad dimenzijskim tovorom (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restavracija Tabela
@@ -6792,7 +6778,6 @@
 DocType: Contract,Party User,Stranski uporabnik
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Sredstva niso bila ustvarjena za <b>{0}</b> . Sredstvo boste morali ustvariti ročno.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Nastavite Podjetje filtriranje prazno, če skupina Z je &quot;Podjetje&quot;"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Ozemlje
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Napotitev datum ne more biti prihodnji datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
 DocType: Loan Repayment,Interest Payable,Obresti za plačilo
@@ -7029,7 +7014,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Povprečna hitrost
 DocType: Appointment,Appointment With,Sestanek s
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Skupni znesek plačila v urniku plačil mora biti enak znesku zaokroženo / zaokroženo
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi udeležbo kot <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","&quot;Izdelek, ki ga zagotavlja stranka&quot;, ne more imeti stopnje vrednotenja"
 DocType: Subscription Plan Detail,Plan,Načrt
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Banka Izjava ravnotežje kot na glavno knjigo
@@ -7724,7 +7708,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Najvišji znesek zaslužka zaposlenega {0} presega {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Skupaj dodeljena listi so več kot dni v obdobju
 DocType: Linked Soil Analysis,Linked Soil Analysis,Povezana analiza tal
-DocType: Pricing Rule,Percentage,odstotek
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Seznami za {0} se prekrivajo, ali želite nadaljevati, ko preskočite prekrivne reže?"
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index e1ece81..866d5e6 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -167,11 +167,10 @@
 DocType: Work Order Operation,Work In Progress,Punë në vazhdim
 DocType: Leave Control Panel,Branch (optional),Dega (opsionale)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Ju lutemi zgjidhni data
-DocType: Item Price,Minimum Qty ,Qty. Minimale
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Qty. Minimale
 DocType: Finance Book,Finance Book,Libri i Financave
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,FDH-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Festa Lista
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Llogaria e prindërve {0} nuk ekziston
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Shqyrtimi dhe veprimi
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ky punonjës tashmë ka një regjistër me të njëjtën kohë shënimi. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Llogaritar
@@ -243,7 +242,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Gain / Humbje
 DocType: Crop,Perennial,gjithëvjetor
 DocType: Program,Is Published,Botohet
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Trego Shënimet e Dorëzimit
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Për të lejuar faturimin, azhurnoni &quot;Mbi lejimin e faturimit&quot; në Cilësimet e Llogarive ose Artikullit."
 DocType: Patient Appointment,Procedure,procedurë
 DocType: Accounts Settings,Use Custom Cash Flow Format,Përdorni Custom Flow Format Custom
@@ -975,7 +973,6 @@
 DocType: Patient,Risk Factors,Faktoret e rrezikut
 DocType: Patient,Occupational Hazards and Environmental Factors,Rreziqet në punë dhe faktorët mjedisorë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Regjistrimet e aksioneve tashmë të krijuara për Rendit të Punës
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kodi i Artikullit&gt; Grupi i Artikujve&gt; Marka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Shihni porositë e kaluara
 DocType: Vital Signs,Respiratory rate,Shkalla e frymëmarrjes
 apps/erpnext/erpnext/config/help.py,Managing Subcontracting,Menaxhimi Nënkontraktimi
@@ -1129,7 +1126,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Gjatë procesit të azhurnimit ndodhi një gabim
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervim Restoranti
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Artikujt tuaj
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i furnizuesit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Propozimi Shkrimi
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagesa Zbritja Hyrja
 DocType: Service Level Priority,Service Level Priority,Prioriteti i nivelit të shërbimit
@@ -1924,7 +1920,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Është kthimi (Shënimi i debitit)
 DocType: Workstation,Wages,Pagat
 DocType: Asset Maintenance,Maintenance Manager Name,Emri Menaxheri i Mirëmbajtjes
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaksionet kundër kompanisë tashmë ekzistojnë!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Kërkimi i faqes
 DocType: Agriculture Task,Urgent,Urgjent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Vrojtimi i shënimeve ......
@@ -2610,7 +2605,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Termi i pagesës në rresht {0} është ndoshta një kopje.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Bujqësia (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Shqip Paketimi
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi vendosni Seritë e Emërtimit për {0} përmes Konfigurimit&gt; Cilësimet&gt; Seritë e Emrave
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Setup SMS settings portë
 DocType: Disease,Common Name,Emer i perbashket
@@ -2774,7 +2768,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lë alokuar sukses për {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Asnjë informacion që të dal
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Vetëm skedarët .csv dhe .xlsx janë mbështetur aktualisht
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi vendosni Sistemin e Emërtimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e BNJ
 DocType: Shipping Rule Condition,From Value,Nga Vlera
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
 DocType: Loan,Repayment Method,Metoda Ripagimi
@@ -4004,7 +3997,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Kerkohet Në
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Nëse kontrollohet, fsheh dhe çaktivizon fushën e rrumbullakosur totale në Rrëshqet e pagave"
 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.,Kjo është kompensimi (ditët) e paracaktuar për Datën e Dorëzimit në Urdhrat e Shitjes. Kompensimi i kthimit është 7 ditë nga data e vendosjes së porosisë.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi vendosni seritë e numrave për Pjesëmarrje përmes Konfigurimit&gt; Seritë e numrave
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Fetch Updates Updating
@@ -4599,7 +4591,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Është kostoja e financimit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
 DocType: Packing Slip,If more than one package of the same type (for print),Nëse më shumë se një paketë të të njëjtit lloj (për shtyp)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërtimit të Instruktorëve në Arsim&gt; Cilësimet e arsimit
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Vendosni klientin e parazgjedhur në Cilësimet e Restorantit
 ,Salary Register,Paga Regjistrohu
 DocType: Company,Default warehouse for Sales Return,Depo e paracaktuar për kthimin e shitjeve
@@ -4865,7 +4856,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Aktivitetet në pritje
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Krijo Test Lab
 DocType: Patient Appointment,Reminded,kujtoi
-DocType: Homepage Section,Cards,letra
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Shiko tabelën e llogarive
 DocType: Chapter Member,Chapter Member,Anëtar i Kapitullit
 DocType: Material Request Plan Item,Minimum Order Quantity,Sasia minimale e porosisë
@@ -4881,7 +4871,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Datat e ardhshme nuk lejohen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Data e dorëzimit të pritshëm duhet të jetë pas datës së porosisë së shitjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Reorder Niveli
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Chart e Llogarive Stampa
+DocType: Company,Chart Of Accounts Template,Chart e Llogarive Stampa
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Akti i azhurnimit duhet të jetë i mundur për faturën e blerjes {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Item Çmimi përditësuar për {0} në çmimore {1}
@@ -5442,8 +5432,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Libri i aksioneve
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Fatura Sales {0} krijuar
 DocType: Employee,Confirmation Date,Konfirmimi Data
-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","Ju lutemi fshini punonjësin <a href=""#Form/Employee/{0}"">{0}</a> \ për të anulluar këtë dokument"
 DocType: Inpatient Occupancy,Check Out,Kontrolloni
 DocType: C-Form,Total Invoiced Amount,Shuma totale e faturuar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty nuk mund të jetë më i madh se Max Qty
@@ -5644,7 +5632,6 @@
 DocType: Cheque Print Template,Cheque Width,Gjerësia çek
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Vlereso Shitja Çmimi për artikullin kundër Blerje votuarat vetëm ose të votuarat Vlerësimit
 DocType: Fee Schedule,Fee Schedule,Orari Tarifa
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Etiketat e kolonave:
 DocType: Bank Transaction,Settled,Vendosën
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,tatim
 DocType: Quality Feedback,Parameters,parametrat
@@ -6309,6 +6296,7 @@
 DocType: Salary Component,Formula,formulë
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Sasia e kërkuar
+DocType: Cash Flow Mapping Template,Template Name,Emri template
 DocType: Lab Test Template,Lab Test Template,Modeli i testimit të laboratorit
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Llogaria e Shitjes
 DocType: Purchase Invoice Item,Total Weight,Pesha Totale
@@ -6367,7 +6355,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Si në Data
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Si në Data
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,regjistrimi Date
 DocType: Healthcare Settings,Out Patient SMS Alerts,Nga paralajmërimet e pacientit me SMS
@@ -6432,7 +6420,6 @@
 DocType: Course Content,Quiz,pyes
 DocType: Subscription,Trial Period End Date,Data e përfundimit të periudhës së gjykimit
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Jo Authroized që nga {0} tejkalon kufijtë
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Filloni të futni të dhëna nga këtu:
 DocType: Serial No,Asset Status,Statusi i Aseteve
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Mbi ngarkesën dimensionale (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Tavolina e restorantit
@@ -6650,7 +6637,6 @@
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,Submit Review,Submit Rishikimi
 DocType: Contract,Party User,Përdoruesi i Partisë
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Ju lutemi të vendosur Company filtër bosh nëse Group By është &#39;Company&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i klientëve&gt; Territori
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posting Data nuk mund të jetë data e ardhmja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
 DocType: Loan Repayment,Interest Payable,Kamatë e pagueshme
@@ -6883,7 +6869,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Norma mesatare
 DocType: Appointment,Appointment With,Emërimi Me
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Shuma totale e pagesës në orarin e pagesës duhet të jetë e barabartë me grandin / totalin e rrumbullakët
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Shënoni frekuentimin si <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Artikujt e siguruar nga klienti&quot; nuk mund të ketë Shkallën e Vlerësimit
 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,Balanca Deklarata Banka sipas Librit Kryesor
@@ -7560,7 +7545,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Shuma maksimale e përfitimit të punonjësit {0} tejkalon {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Gjithsej gjethet e ndara janë më shumë se ditë në periudhën
 DocType: Linked Soil Analysis,Linked Soil Analysis,Analizë e Lidhjeve të Tokës
-DocType: Pricing Rule,Percentage,përqindje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Item {0} duhet të jetë një gjendje Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Puna Në Magazina Progresit
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Oraret për {0} mbivendosen, a doni të vazhdoni pas skiping slots overplaed?"
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 7f844f4..31db938 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -168,12 +168,11 @@
 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},БОМ рекурзија: {0} не може бити дете од {1}
 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,рачуновођа
@@ -245,7 +244,6 @@
 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,Користите Цустом Флов Флов Формат
@@ -987,7 +985,6 @@
 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 &gt; Item Group &gt; Brand,Код артикла&gt; Група артикала&gt; Марка
 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,Стопа респираторних органа
@@ -1146,7 +1143,6 @@
 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 &gt; Supplier Type,Добављач&gt; врста добављача
 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,Приоритет на нивоу услуге
@@ -1448,7 +1444,6 @@
 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} -&gt; {1}) not found for item: {2},Фактор конверзије УОМ ({0} -&gt; {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.,Мењање мјењача мора бити примјењиво за куповину или продају.
@@ -1969,7 +1964,6 @@
 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......,Дохваћање записа ......
@@ -2672,7 +2666,6 @@
 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 &gt; Settings &gt; Naming Series,Молимо поставите Наминг Сериес за {0} путем Подешавање&gt; Подешавања&gt; Именовање серије
 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,Уобичајено име
@@ -2839,7 +2832,6 @@
 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,Тренутно су подржане само .цсв и .клск датотеке
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо вас да подесите систем именовања запослених у људским ресурсима&gt; ХР подешавања
 DocType: Shipping Rule Condition,From Value,Од вредности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Производња Количина је обавезно
 DocType: Loan,Repayment Method,Начин отплате
@@ -4097,7 +4089,6 @@
 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 &gt; Numbering Series,Молимо вас да подесите серију нумерирања за Аттенданце путем Подешавање&gt; Серија нумерирања
 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,Изврши ажурирање претплате
@@ -4735,7 +4726,6 @@
 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 &gt; Education Settings,Поставите систем именовања инструктора у Образовање&gt; Подешавања образовања
 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,Подразумевано складиште за повраћај продаје
@@ -5008,7 +4998,6 @@
 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,минимална количина поруџбине
@@ -5026,7 +5015,7 @@
 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}
@@ -5596,8 +5585,6 @@
 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,Минимална Кол не може бити већи од Мак Кол
@@ -5806,7 +5793,6 @@
 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,Параметри
@@ -6491,6 +6477,7 @@
 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,Рачун продаје
@@ -6551,7 +6538,7 @@
 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,upis Датум
 DocType: Healthcare Settings,Out Patient SMS Alerts,Оут Патиент СМС Алертс
@@ -6617,7 +6604,6 @@
 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),Овер Дименсионал Царго (ОДЦ)
 DocType: Restaurant Order Entry,Restaurant Table,Ресторан Табле
@@ -6846,7 +6832,6 @@
 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,Зарађена камата
@@ -7081,7 +7066,6 @@
 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,Банка Биланс по Главној књизи
@@ -7778,7 +7762,6 @@
 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} се преклапају, да ли желите да наставите након прескакања преклапаних слотова?"
diff --git a/erpnext/translations/sr_sp.csv b/erpnext/translations/sr_sp.csv
index 7ec7d56..14297f9 100644
--- a/erpnext/translations/sr_sp.csv
+++ b/erpnext/translations/sr_sp.csv
@@ -613,7 +613,7 @@
 DocType: Stock Entry Detail,Stock Entry Detail,Detalji unosa zaliha
 DocType: Sales Invoice,Accounting Details,Računovodstveni detalji
 DocType: Asset Movement,Stock Manager,Menadžer zaliha
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Na datum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Na datum
 DocType: Serial No,Is Cancelled,Je otkazan
 DocType: Naming Series,Setup Series,Podešavanje tipa dokumenta
 ,Point of Sale,Kasa
@@ -908,7 +908,7 @@
 DocType: Purchase Order,To Bill,Za fakturisanje
 apps/erpnext/erpnext/projects/doctype/project/project.js,Gantt Chart,Gant dijagram
 DocType: Bin,Requested Quantity,Tražena količina
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Templejt za kontni plan
+DocType: Company,Chart Of Accounts Template,Templejt za kontni plan
 DocType: Employee Attendance Tool,Marked Attendance,Označeno prisustvo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite podrazumjevanu listu praznika za Zaposlenog {0} ili Preduzeće {1}
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py,Pending Amount,Iznos na čekanju
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index e9df6f7..200f693 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Pågående Arbete
 DocType: Leave Control Panel,Branch (optional),Gren (valfritt)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Välj datum
-DocType: Item Price,Minimum Qty ,Minsta antal
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minsta 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 inte vara barn till {1}
 DocType: Finance Book,Finance Book,Finansbok
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Holiday Lista
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Moderkontot {0} finns inte
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Granskning och åtgärder
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Denna anställd har redan en logg med samma tidsstämpel. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Revisor
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Vinst / förlust
 DocType: Crop,Perennial,Perenn
 DocType: Program,Is Published,Publiceras
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Visa leveransanteckningar
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",För att tillåta överfakturering uppdaterar du &quot;Över faktureringsbidrag&quot; i Kontoinställningar eller artikeln.
 DocType: Patient Appointment,Procedure,Procedur
 DocType: Accounts Settings,Use Custom Cash Flow Format,Använd anpassat kassaflödesformat
@@ -988,7 +986,6 @@
 DocType: Patient,Risk Factors,Riskfaktorer
 DocType: Patient,Occupational Hazards and Environmental Factors,Arbetsrisker och miljöfaktorer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Lagerinmatningar som redan har skapats för arbetsorder
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Produktkod&gt; Produktgrupp&gt; Märke
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Se tidigare order
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} konversationer
 DocType: Vital Signs,Respiratory rate,Andningsfrekvens
@@ -1146,7 +1143,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Ett fel uppstod under uppdateringsprocessen
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurangbokning
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Dina artiklar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Förslagsskrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betalning Entry Avdrag
 DocType: Service Level Priority,Service Level Priority,Servicenivåprioritet
@@ -1449,7 +1445,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Var god välj Företag och Bokningsdatum för att få poster
 DocType: Asset,Maintenance,Underhåll
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Få från patientmötet
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omvandlingsfaktor ({0} -&gt; {1}) hittades inte för artikeln: {2}
 DocType: Subscriber,Subscriber,Abonnent
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valutaväxling måste vara tillämplig för köp eller försäljning.
@@ -1950,7 +1945,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Är Retur (Debit Not)
 DocType: Workstation,Wages,Löner
 DocType: Asset Maintenance,Maintenance Manager Name,Underhållsansvarig namn
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaktioner mot företaget finns redan!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Begär webbplats
 DocType: Agriculture Task,Urgent,Brådskande
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Hämtar poster ......
@@ -2652,7 +2646,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Betalningstiden i rad {0} är eventuellt en dubblett.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Jordbruk (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Följesedel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Inställningar&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 DocType: Disease,Common Name,Vanligt namn
@@ -2819,7 +2812,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lämnar Avsatt framgångsrikt för {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Inga produkter att packa
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Endast .csv- och .xlsx-filer stöds för närvarande
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installera anställdes namngivningssystem i personalresurser&gt; HR-inställningar
 DocType: Shipping Rule Condition,From Value,Från Värde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
 DocType: Loan,Repayment Method,återbetalning Metod
@@ -4078,7 +4070,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Obligatorisk På
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Om markerat, döljer och inaktiverar fältet Avrundat totalt i lönesedlar"
 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.,Detta är standardförskjutningen (dagar) för leveransdatum i försäljningsorder. Återkopplingsförskjutningen är 7 dagar från beställningsdatumet.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ställ in numreringsserier för närvaro via Setup&gt; Numbering Series
 DocType: Rename Tool,File to Rename,Fil att byta namn på
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Hämta prenumerationsuppdateringar
@@ -4686,7 +4677,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Är finansieringskostnad
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
 DocType: Packing Slip,If more than one package of the same type (for print),Om mer än ett paket av samma typ (för utskrift)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installera instruktörens namngivningssystem i utbildning&gt; Utbildningsinställningar
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Ange standardkund i Restauranginställningar
 ,Salary Register,lön Register
 DocType: Company,Default warehouse for Sales Return,Standardlager för återförsäljning
@@ -4959,7 +4949,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Väntande Verksamhet
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Skapa labtest
 DocType: Patient Appointment,Reminded,påminde
-DocType: Homepage Section,Cards,kort
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Visa diagram över konton
 DocType: Chapter Member,Chapter Member,Kapitelmedlem
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum antal
@@ -4977,7 +4966,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Framtida datum inte tillåtet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Förväntad leveransdatum bör vara efter försäljningsbeställningsdatum
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Ombeställningsnivå
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Konto Mall
+DocType: Company,Chart Of Accounts Template,Konto Mall
 DocType: Attendance,Attendance Date,Närvaro Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Uppdateringslagret måste vara aktiverat för inköpsfakturan {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Artikel Pris uppdaterad för {0} i prislista {1}
@@ -5548,8 +5537,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Dela Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Försäljningsfaktura {0} skapad
 DocType: Employee,Confirmation Date,Bekräftelsedatum
-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","Radera anställden <a href=""#Form/Employee/{0}"">{0}</a> \ för att avbryta detta dokument"
 DocType: Inpatient Occupancy,Check Out,Checka ut
 DocType: C-Form,Total Invoiced Amount,Sammanlagt fakturerat belopp
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Antal kan inte vara större än Max Antal
@@ -5758,7 +5745,6 @@
 DocType: Cheque Print Template,Cheque Width,Check Bredd
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validera försäljningspriset för punkt mot Purchase Rate eller Värderings Rate
 DocType: Fee Schedule,Fee Schedule,avgift Schema
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolumnetiketter:
 DocType: Bank Transaction,Settled,Fast
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,parametrar
@@ -6442,6 +6428,7 @@
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seriell #
 DocType: Material Request Plan Item,Required Quantity,Mängd som krävs
+DocType: Cash Flow Mapping Template,Template Name,Mallnamn
 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},Redovisningsperioden överlappar med {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Försäljningskonto
@@ -6502,7 +6489,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Som på Date
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Som på Date
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Inskrivningsdatum
 DocType: Healthcare Settings,Out Patient SMS Alerts,Ut Patient SMS Alerts
@@ -6568,7 +6555,6 @@
 DocType: Course Content,Quiz,Frågesport
 DocType: Subscription,Trial Period End Date,Pröva period Slutdatum
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Inte auktoriserad eftersom {0} överskrider gränser
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Börja ange data härifrån:
 DocType: Serial No,Asset Status,Asset Status
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Över dimensionell last (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurangbord
@@ -6796,7 +6782,6 @@
 DocType: Contract,Party User,Party-användare
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Tillgångar som inte skapats för <b>{0}</b> . Du måste skapa tillgångar manuellt.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Vänligen ange Företagets filter tomt om Group By är &quot;Company&quot;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Publiceringsdatum kan inte vara framtida tidpunkt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
 DocType: Loan Repayment,Interest Payable,Betalningsränta
@@ -7032,7 +7017,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Genomsnitt
 DocType: Appointment,Appointment With,Möte med
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totala betalningsbeloppet i betalningsplanen måste vara lika med Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Markera närvaro som <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Kundförsett objekt"" kan inte ha värderingskurs"
 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,Kontoutdrag balans per huvudbok
@@ -7726,7 +7710,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maximal förmånsbelopp för anställd {0} överstiger {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Totalt tilldelade bladen är mer än dagar under perioden
 DocType: Linked Soil Analysis,Linked Soil Analysis,Länkad jordanalys
-DocType: Pricing Rule,Percentage,Procentsats
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Produkt {0} måste vara en lagervara
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard 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 ?","Scheman för {0} överlappar, vill du fortsätta efter att ha skurit överlappade slitsar?"
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index 8277b9b..8182327 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Kazi inaendelea
 DocType: Leave Control Panel,Branch (optional),Tawi (hiari)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Tafadhali chagua tarehe
-DocType: Item Price,Minimum Qty ,Uchina cha Chini
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Uchina cha Chini
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Kurudiwa kwa BOM: {0} haiwezi kuwa mtoto wa {1}
 DocType: Finance Book,Finance Book,Kitabu cha Fedha
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC -YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Orodha ya likizo
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Akaunti ya mzazi {0} haipo
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Mapitio na Kitendo
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Mfanyikazi huyu tayari ana logi na alama ya muda sawa. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Mhasibu
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Kupata / Kupoteza
 DocType: Crop,Perennial,Kudumu
 DocType: Program,Is Published,Imechapishwa
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Onyesha Vidokezo vya Uwasilishaji
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Ili kuruhusu malipo zaidi, sasisha &quot;Idhini ya malipo ya juu ya bili&quot; katika Mipangilio ya Akaunti au Bidhaa."
 DocType: Patient Appointment,Procedure,Utaratibu
 DocType: Accounts Settings,Use Custom Cash Flow Format,Tumia Format ya Msajili wa Fedha ya Desturi
@@ -981,7 +979,6 @@
 DocType: Patient,Risk Factors,Mambo ya Hatari
 DocType: Patient,Occupational Hazards and Environmental Factors,Hatari za Kazi na Mambo ya Mazingira
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entries Entries tayari kuundwa kwa Kazi Order
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Nambari ya Bidhaa&gt; Kikundi cha bidhaa&gt; Brand
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Tazama maagizo ya zamani
 DocType: Vital Signs,Respiratory rate,Kiwango cha kupumua
 apps/erpnext/erpnext/config/help.py,Managing Subcontracting,Kusimamia Kudhibiti Msaada
@@ -1138,7 +1135,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Hitilafu ilitokea wakati wa mchakato wa sasisho
 DocType: Restaurant Reservation,Restaurant Reservation,Uhifadhi wa Mkahawa
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vitu vyako
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Mtoaji&gt; Aina ya wasambazaji
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Kuandika Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Utoaji wa Kuingia kwa Malipo
 DocType: Service Level Priority,Service Level Priority,Kipaumbele cha Kiwango cha Huduma
@@ -1437,7 +1433,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Tafadhali chagua tarehe ya Kampuni na Kuajili ili uweze kuingia
 DocType: Asset,Maintenance,Matengenezo
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Pata kutoka kwa Mkutano wa Wagonjwa
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Sababu ya ubadilishaji wa UOM ({0} -&gt; {1}) haipatikani kwa kipengee: {2}
 DocType: Subscriber,Subscriber,Msajili
 DocType: Item Attribute Value,Item Attribute Value,Thamani ya Thamani ya Bidhaa
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Kubadilisha Fedha lazima iwezekanavyo kwa Ununuzi au kwa Ununuzi.
@@ -1934,7 +1929,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Inarudi (Kumbuka Debit)
 DocType: Workstation,Wages,Mishahara
 DocType: Asset Maintenance,Maintenance Manager Name,Jina la Meneja wa Matengenezo
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Manunuzi dhidi ya kampuni tayari yapo!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Kuomba Tovuti
 DocType: Agriculture Task,Urgent,Haraka
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Inachukua rekodi ......
@@ -2629,7 +2623,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Muda wa Malipo katika mstari {0} inawezekana kuwa duplicate.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Kilimo (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Ufungashaji wa Ufungashaji
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Jina la {0} kupitia Kusanidi&gt; Mipangilio&gt; Mfululizo wa Kumtaja
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kodi ya Ofisi
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Sanidi mipangilio ya uingizaji wa SMS
 DocType: Disease,Common Name,Jina la kawaida
@@ -2795,7 +2788,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Majani yaliyopangwa kwa Mafanikio kwa {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Hakuna Vipande vya kuingiza
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Faili za .csv na .xlsx pekee ndizo zinazotumika kwa sasa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mfanyikazi katika Rasilimali Watu&gt; Mipangilio ya HR
 DocType: Shipping Rule Condition,From Value,Kutoka kwa Thamani
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Uzalishaji wa Wingi ni lazima
 DocType: Loan,Repayment Method,Njia ya kulipa
@@ -4041,7 +4033,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Inahitajika
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ikiwa imegunduliwa, huficha na kulemaza Jumla ya Jumla ya uwanja katika Slips Slary"
 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.,Hii ndio kosa la kawaida (siku) kwa Tarehe ya Utoaji katika Maagizo ya Uuzaji. Mkato wa kurudi nyuma ni siku 7 kutoka tarehe ya uwekaji amri.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali sasisha safu za nambari za Kuhudhuria kupitia Usanidi&gt; Mfululizo wa hesabu
 DocType: Rename Tool,File to Rename,Funga Kurejesha tena
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Tafadhali chagua BOM kwa Bidhaa katika Row {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Pata Updates za Usajili
@@ -4643,7 +4634,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Ni Gharama za Fedha
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Mahudhurio ya mfanyakazi {0} tayari amewekwa alama
 DocType: Packing Slip,If more than one package of the same type (for print),Ikiwa zaidi ya mfuko mmoja wa aina moja (kwa kuchapishwa)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mtaalam katika Elimu&gt; Mipangilio ya elimu
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Tafadhali weka mteja default katika Mipangilio ya Mkahawa
 ,Salary Register,Daftari ya Mshahara
 DocType: Company,Default warehouse for Sales Return,Ghala la Default la Kurudi kwa Uuzaji
@@ -4914,7 +4904,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Shughuli zinazosubiri
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Unda Jaribio la Lab
 DocType: Patient Appointment,Reminded,Alikumbushwa
-DocType: Homepage Section,Cards,Kadi
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Angalia Chati ya Akaunti
 DocType: Chapter Member,Chapter Member,Mjumbe wa Sura
 DocType: Material Request Plan Item,Minimum Order Quantity,Kiwango cha chini cha utaratibu
@@ -4932,7 +4921,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Tarehe za baadaye haziruhusiwi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Tarehe ya utoaji inayotarajiwa inapaswa kuwa baada ya Tarehe ya Kuagiza Mauzo
 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,Chati ya Kigezo cha Akaunti
+DocType: Company,Chart Of Accounts Template,Chati ya Kigezo cha Akaunti
 DocType: Attendance,Attendance Date,Tarehe ya Kuhudhuria
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Sasisha hisa lazima ziwezeshe kwa ankara ya ununuzi {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Item Bei iliyosasishwa kwa {0} katika Orodha ya Bei {1}
@@ -5495,8 +5484,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Shirikisha Ledger
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Invoice ya Mauzo {0} imeundwa
 DocType: Employee,Confirmation Date,Tarehe ya uthibitisho
-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","Tafadhali futa Mfanyikazi <a href=""#Form/Employee/{0}"">{0}</a> \ ili kughairi hati hii"
 DocType: Inpatient Occupancy,Check Out,Angalia
 DocType: C-Form,Total Invoiced Amount,Kiasi kilichopakiwa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty haiwezi kuwa kubwa kuliko Max Qty
@@ -5703,7 +5690,6 @@
 DocType: Cheque Print Template,Cheque Width,Angalia Upana
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Thibitisha Bei ya Kuuza kwa Bidhaa juu ya Kiwango cha Ununuzi au Kiwango cha Vigezo
 DocType: Fee Schedule,Fee Schedule,Ratiba ya ada
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Lebo za safu:
 DocType: Bank Transaction,Settled,Tulia
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Viwanja
@@ -6377,6 +6363,7 @@
 DocType: Salary Component,Formula,Mfumo
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Kiasi kinachohitajika
+DocType: Cash Flow Mapping Template,Template Name,Jina la Kigezo
 DocType: Lab Test Template,Lab Test Template,Kigezo cha Mtihani wa Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Kipindi cha Uhasibu huingiliana na {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Akaunti ya Mauzo
@@ -6437,7 +6424,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Tarehe ya Kuangalia
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Akaunti {0}: Akaunti ya Mzazi {1} si ya kampuni: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Imefanikiwa kufutwa shughuli zote zinazohusiana na kampuni hii!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kama tarehe
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kama tarehe
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Tarehe ya Kuandikisha
 DocType: Healthcare Settings,Out Patient SMS Alerts,Nje Tahadhari za Mgonjwa wa SMS
@@ -6503,7 +6490,6 @@
 DocType: Course Content,Quiz,Jaribio
 DocType: Subscription,Trial Period End Date,Tarehe ya Mwisho wa Kipindi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Sio kuchapishwa tangu {0} inapozidi mipaka
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Anza kuingiza data kutoka hapa:
 DocType: Serial No,Asset Status,Hali ya Mali
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Zaidi ya Cargo Dimensional (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Jedwali la Mgahawa
@@ -6729,7 +6715,6 @@
 DocType: Contract,Party User,Mtumiaji wa Chama
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Mali ambayo haijatengenezwa kwa <b>{0}</b> . Utalazimika kuunda mali kwa mikono.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Tafadhali weka Chujio cha Kampuni kikiwa tupu ikiwa Kundi Na &#39;Kampuni&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mteja&gt; Kikundi cha Wateja&gt; Wilaya
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Tarehe ya Kuchapisha haiwezi kuwa tarehe ya baadaye
 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} hailingani na {2} {3}
 DocType: Loan Repayment,Interest Payable,Riba Inalipwa
@@ -6963,7 +6948,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Kiwango cha wastani
 DocType: Appointment,Appointment With,Uteuzi na
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Kiwango cha Malipo ya Jumla katika Ratiba ya Malipo lazima iwe sawa na Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marko mahudhurio kama <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Bidhaa iliyotolewa na Wateja&quot; haiwezi kuwa na Kiwango cha Tathimini
 DocType: Subscription Plan Detail,Plan,Mpango
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Usawa wa Taarifa ya Benki kama kwa Jedwali Mkuu
@@ -7653,7 +7637,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Ufikiaji wa kiasi cha mfanyakazi {0} unazidi {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Majani yote yaliyotengwa ni zaidi ya siku katika kipindi
 DocType: Linked Soil Analysis,Linked Soil Analysis,Uchunguzi wa ardhi uliohusishwa
-DocType: Pricing Rule,Percentage,Asilimia
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Kipengee {0} kinafaa kuwa kitu cha hisa
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kazi ya Kazi katika Hifadhi ya Maendeleo
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Mipangilio ya {0} inaingizwa, unataka kuendelea baada ya kuruka mipaka iliyopandwa?"
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 39870b9..4f1e03d 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -166,11 +166,10 @@
 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.-,ஹெச்எல்சி-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,கணக்கர்
@@ -242,7 +241,6 @@
 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.","பில்லிங்கை அனுமதிக்க, கணக்கு அமைப்புகள் அல்லது உருப்படிகளில் &quot;ஓவர் பில்லிங் கொடுப்பனவு&quot; புதுப்பிக்கவும்."
 DocType: Patient Appointment,Procedure,செயல்முறை
 DocType: Accounts Settings,Use Custom Cash Flow Format,தனிப்பயன் காசுப் பாய்ச்சல் வடிவமைப்பு பயன்படுத்தவும்
@@ -973,7 +971,6 @@
 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 &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 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,சுவாச விகிதம்
@@ -1123,7 +1120,6 @@
 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 &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 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,சேவை நிலை முன்னுரிமை
@@ -1420,7 +1416,6 @@
 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} -&gt; {1}) not found for item: {2},உருப்படிக்கு UOM மாற்று காரணி ({0} -&gt; {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.,நாணய மாற்றுதல் வாங்குதல் அல்லது விற்பனைக்கு பொருந்தும்.
@@ -1931,7 +1926,6 @@
 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......,பதிவுகளை பெறுதல் ......
@@ -2776,7 +2770,6 @@
 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 &gt; HR Settings,மனிதவள&gt; மனிதவள அமைப்புகளில் பணியாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
 DocType: Loan,Repayment Method,திரும்பச் செலுத்துதல் முறை
@@ -4001,7 +3994,6 @@
 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 &gt; Numbering Series,அமைவு&gt; எண்ணைத் தொடர் வழியாக வருகைக்கான எண்ணைத் தொடரை அமைக்கவும்
 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,சந்தா புதுப்பிப்புகளை எடுங்கள்
@@ -4628,7 +4620,6 @@
 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 &gt; Education Settings,கல்வி&gt; கல்வி அமைப்புகளில் பயிற்றுவிப்பாளர் பெயரிடும் முறையை அமைக்கவும்
 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,விற்பனை வருவாய்க்கான இயல்புநிலை கிடங்கு
@@ -4892,7 +4883,6 @@
 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,குறைந்தபட்ச ஆர்டர் அளவு
@@ -4908,7 +4898,7 @@
 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},விலை பட்டியல் {1} ல்   பொருள் விலை {0} மேம்படுத்தப்பட்டது
@@ -5465,8 +5455,6 @@
 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,மொத்த விலை விவரம் தொகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,குறைந்தபட்ச  அளவு மேக்ஸ் அளவு அதிகமாக இருக்க முடியாது
@@ -5668,7 +5656,6 @@
 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,அளவுருக்கள்
@@ -6338,6 +6325,7 @@
 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,மொத்த எடை
@@ -6396,7 +6384,7 @@
 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 எச்சரிக்கைகள்
@@ -6461,7 +6449,6 @@
 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,உணவக அட்டவணை
@@ -6680,7 +6667,6 @@
 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,செலுத்த வேண்டிய வட்டி
@@ -6911,7 +6897,6 @@
 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,பொது அறிக்கையின் படி வங்கி அறிக்கையின் சமநிலை
@@ -7582,7 +7567,6 @@
 DocType: Item Customer Detail,Item Customer Detail,பொருள் வாடிக்கையாளர் விபரம்
 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} மேலெழுதல்களைப் பெற, மேல்விளக்க இடங்களைக் கைவிட்ட பிறகு தொடர விரும்புகிறீர்களா?"
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index d067c0e..42a6f4a 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -165,7 +165,7 @@
 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,హాలిడే జాబితా
@@ -240,7 +240,6 @@
 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.","బిల్లింగ్‌ను అనుమతించడానికి, ఖాతాల సెట్టింగ్‌లు లేదా అంశంలో &quot;ఓవర్ బిల్లింగ్ అలవెన్స్&quot; ను నవీకరించండి."
 DocType: Patient Appointment,Procedure,విధానము
 DocType: Accounts Settings,Use Custom Cash Flow Format,కస్టమ్ క్యాష్ ఫ్లో ఫార్మాట్ ఉపయోగించండి
@@ -967,7 +966,6 @@
 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 &gt; Item Group &gt; Brand,ఐటెమ్ కోడ్&gt; ఐటమ్ గ్రూప్&gt; బ్రాండ్
 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,శ్వాసక్రియ రేటు
@@ -1118,7 +1116,6 @@
 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 &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 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,సేవా స్థాయి ప్రాధాన్యత
@@ -1416,7 +1413,6 @@
 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} -&gt; {1}) not found for item: {2},అంశం కోసం UOM మార్పిడి కారకం ({0} -&gt; {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.,కరెన్సీ ఎక్స్ఛేంజ్ కొనుగోలు లేదా అమ్మకం కోసం వర్తింపజేయాలి.
@@ -1909,7 +1905,6 @@
 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......,రికార్డులు పొందడం ......
@@ -2754,7 +2749,6 @@
 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 &gt; HR Settings,దయచేసి మానవ వనరులు&gt; హెచ్ ఆర్ సెట్టింగులలో ఉద్యోగుల నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Shipping Rule Condition,From Value,విలువ నుంచి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,తయారీ పరిమాణం తప్పనిసరి
 DocType: Loan,Repayment Method,తిరిగి చెల్లించే విధానం
@@ -3974,7 +3968,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Required న
 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 &gt; Numbering Series,దయచేసి సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబరింగ్ సిరీస్‌ను సెటప్ చేయండి
 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,సబ్స్క్రిప్షన్ నవీకరణలను పొందండి
@@ -4566,7 +4559,6 @@
 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 &gt; Education Settings,దయచేసి విద్య&gt; విద్య సెట్టింగులలో బోధకుడు నామకరణ వ్యవస్థను సెటప్ చేయండి
 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,సేల్స్ రిటర్న్ కోసం డిఫాల్ట్ గిడ్డంగి
@@ -4828,7 +4820,6 @@
 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,కనీస ఆర్డర్ పరిమాణం
@@ -4844,7 +4835,7 @@
 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}
@@ -5398,8 +5389,6 @@
 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,మొత్తం ఇన్వాయిస్ మొత్తం
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min ప్యాక్ చేసిన అంశాల మాక్స్ ప్యాక్ చేసిన అంశాల కంటే ఎక్కువ ఉండకూడదు
@@ -5599,7 +5588,6 @@
 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 +6261,7 @@
 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,మొత్తం బరువు
@@ -6331,7 +6320,7 @@
 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 హెచ్చరికలు
@@ -6396,7 +6385,6 @@
 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),ఓవర్ డైమెన్షనల్ కార్గో (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,రెస్టారెంట్ టేబుల్
@@ -6616,7 +6604,6 @@
 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,కట్టవలసిన వడ్డీ
@@ -6847,7 +6834,6 @@
 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,జనరల్ లెడ్జర్ ప్రకారం బ్యాంక్ స్టేట్మెంట్ సంతులనం
@@ -7523,7 +7509,6 @@
 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} అతివ్యాప్తాల కోసం షెడ్యూల్స్ కోసం, మీరు అతివ్యాప్తి చెందిన స్లాట్లను వదిలిన తర్వాత కొనసాగించాలనుకుంటున్నారా?"
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index c2a96f0..d0b0503 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -168,12 +168,11 @@
 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 @@
 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.",หากต้องการอนุญาตให้เรียกเก็บเงินเกินอัปเดต &quot;การอนุญาตการเรียกเก็บเงินเกิน&quot; ในการตั้งค่าบัญชีหรือรายการ
 DocType: Patient Appointment,Procedure,ขั้นตอน
 DocType: Accounts Settings,Use Custom Cash Flow Format,ใช้รูปแบบกระแสเงินสดที่กำหนดเอง
@@ -989,7 +987,6 @@
 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 &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มรายการ&gt; แบรนด์
 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,อัตราการหายใจ
@@ -1148,7 +1145,6 @@
 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 &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้จำหน่าย
 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,ระดับความสำคัญของการบริการ
@@ -1451,7 +1447,6 @@
 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,ได้รับจากผู้ป่วย Encounter
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ไม่พบปัจจัยการแปลง UOM ({0} -&gt; {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.,ต้องใช้การแลกเปลี่ยนสกุลเงินเพื่อซื้อหรือขาย
@@ -1971,7 +1966,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),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......,กำลังดึงบันทึก ......
@@ -2675,7 +2669,6 @@
 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 &gt; Settings &gt; Naming Series,โปรดตั้ง Naming Series สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; 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
 DocType: Disease,Common Name,ชื่อสามัญ
@@ -2842,7 +2835,6 @@
 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 &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
 DocType: Loan,Repayment Method,วิธีการชำระหนี้
@@ -4103,7 +4095,6 @@
 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 &gt; Numbering Series,โปรดตั้งค่าหมายเลขลำดับสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; ลำดับเลข
 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,เรียกข้อมูลอัปเดตการสมัครสมาชิก
@@ -4743,7 +4734,6 @@
 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 &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในด้านการศึกษา&gt; การตั้งค่าการศึกษา
 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,คลังสินค้าเริ่มต้นสำหรับการคืนสินค้า
@@ -5016,7 +5006,6 @@
 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,สร้าง 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,จำนวนสั่งซื้อขั้นต่ำ
@@ -5034,7 +5023,7 @@
 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}
@@ -5605,8 +5594,6 @@
 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,นาที จำนวน ไม่สามารถ จะมากกว่า จำนวน สูงสุด
@@ -5815,7 +5802,6 @@
 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,พารามิเตอร์
@@ -6499,6 +6485,7 @@
 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,เทมเพลตการทดสอบ Lab
 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,บัญชีขาย
@@ -6559,7 +6546,7 @@
 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 สำหรับผู้ป่วยรายใหญ่
@@ -6625,7 +6612,6 @@
 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),การขนส่งสินค้าแบบ Over Dimensional Cargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,โต๊ะอาหาร
@@ -6853,7 +6839,6 @@
 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 เป็น &#39;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}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
 DocType: Loan Repayment,Interest Payable,ดอกเบี้ยค้างจ่าย
@@ -7090,7 +7075,6 @@
 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,ยอดเงินบัญชีธนาคารตามบัญชีแยกประเภททั่วไป
@@ -7787,7 +7771,6 @@
 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} การทับซ้อนกันคุณต้องการดำเนินการต่อหลังจากข้ามช่องที่ทับซ้อนกันหรือไม่
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index f7421a6..ef7c7c9 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -183,13 +183,12 @@
 DocType: Work Order Operation,Work In Progress,Devam eden iş
 DocType: Leave Control Panel,Branch (optional),Şube (isteğe bağlı)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,tarih seçiniz
-DocType: Item Price,Minimum Qty ,Minimum adet
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimum adet
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},"BOM özyineleme: {0}, {1} öğesinin alt öğesi olamaz"
 DocType: Finance Book,Finance Book,Finans Kitabı
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Tatil Listesi
 DocType: Appointment Booking Settings,Holiday List,Tatil Listesi
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,{0} üst hesabı mevcut değil
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,İnceleme ve İşlem
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Bu çalışanın zaten aynı zaman damgasına sahip bir günlüğü var. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Muhasebeci
@@ -269,7 +268,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Kazanç / Kayıp
 DocType: Crop,Perennial,uzun ömürlü
 DocType: Program,Is Published,Yayınlandı
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Teslim Notlarını Göster
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Fazla faturalandırmaya izin vermek için, Hesap Ayarları veya Öğesinde &quot;Fatura Ödeneği&quot; nı güncelleyin."
 DocType: Patient Appointment,Procedure,prosedür
 DocType: Accounts Settings,Use Custom Cash Flow Format,Özel Nakit Akışı Biçimini Kullan
@@ -1067,7 +1065,6 @@
 DocType: Patient,Risk Factors,Risk faktörleri
 DocType: Patient,Occupational Hazards and Environmental Factors,Mesleki Tehlikeler ve Çevresel Faktörler
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,İş Emri için önceden hazırlanmış Stok Girişleri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Geçmiş siparişlere bakın
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} ileti dizisi
 DocType: Vital Signs,Respiratory rate,Solunum hızı
@@ -1240,7 +1237,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Güncelleme işlemi sırasında bir hata oluştu
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Rezervasyonu
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Öğeleriniz
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Teklifi Yazma
 DocType: Payment Entry Deduction,Payment Entry Deduction,Ödeme Giriş Kesintisi
@@ -1570,7 +1566,6 @@
 DocType: Asset,Maintenance,Bakım
 DocType: Asset,Maintenance,Bakım
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Hasta Envanterinden Alın
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},{2} öğesi için UOM Dönüşüm faktörü ({0} -&gt; {1}) bulunamadı.
 DocType: Subscriber,Subscriber,Abone
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Döviz Alış Alış veya Satış için geçerli olmalıdır.
@@ -2119,7 +2114,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Iade (banka notu)
 DocType: Workstation,Wages,Ücret
 DocType: Asset Maintenance,Maintenance Manager Name,Bakım Yöneticisi Adı
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Şirkete karşı işlemler zaten var!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Site İsteği
 DocType: Agriculture Task,Urgent,Acil
 DocType: Agriculture Task,Urgent,Acil
@@ -2884,7 +2878,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,"{0} Satırındaki Ödeme Süresi, muhtemelen bir kopyadır."
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Tarım (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Ambalaj Makbuzu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Adlandırma Serisini ayarlayın
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
@@ -3064,7 +3057,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},İzinler {0} için başarıyla tahsis edildi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Ambalajlanacak Ürün Yok
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Şu anda yalnızca .csv ve .xlsx dosyaları desteklenmektedir
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynakları&gt; İK Ayarları bölümünde Çalışan Adlandırma Sistemini kurun
 DocType: Shipping Rule Condition,From Value,Değerden
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
@@ -4411,7 +4403,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Gerekli Açık
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","İşaretlenirse, Maaş Fişlerindeki Yuvarlatılmış Toplam alanını gizler ve devre dışı bırakır"
 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.,"Bu, Müşteri Siparişlerindeki Teslim Tarihi için varsayılan ofsettir (gün). Yedek ofset, sipariş yerleşim tarihinden itibaren 7 gündür."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Katılım&gt; Numaralandırma Serisi aracılığıyla Katılım için numaralandırma serilerini ayarlayın
 DocType: Rename Tool,File to Rename,Rename Dosya
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Abonelik Güncellemeleri Al
@@ -5093,7 +5084,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Mali Maliyet mi
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
 DocType: Packing Slip,If more than one package of the same type (for print),(Baskı için) aynı ambalajdan birden fazla varsa
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitim&gt; Eğitim Ayarları bölümünde Eğitmen Adlandırma Sistemini kurun
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Lütfen Restoran Ayarları&#39;nda varsayılan müşteriyi ayarlayın
 ,Salary Register,Maaş Kayıt
 DocType: Company,Default warehouse for Sales Return,Satış İadesi için varsayılan depo
@@ -5387,7 +5377,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Bekleyen Etkinlikleri
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Laboratuvar Testi Oluştur
 DocType: Patient Appointment,Reminded,hatırlatıldı
-DocType: Homepage Section,Cards,Kartlar
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Hesapların Grafiğini Görüntüle
 DocType: Chapter Member,Chapter Member,Bölüm Üyesi
 DocType: Material Request Plan Item,Minimum Order Quantity,minimum sipariş miktarı
@@ -5405,7 +5394,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Gelecek tarihlere izin verilmiyor
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,"Beklenen Teslim Tarihi, Satış Sipariş Tarihinden sonra olmalıdır"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Yeniden Sipariş Seviyesi
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Hesaplar Şablon Grafik
+DocType: Company,Chart Of Accounts Template,Hesaplar Şablon Grafik
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Satınalma faturası {0} satın alım faturası için etkinleştirilmelidir
@@ -6011,8 +6000,6 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Satış Fatura {0} oluşturuldu
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: Employee,Confirmation Date,Onay Tarihi
-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","Bu dokümanı iptal etmek için lütfen Çalışan <a href=""#Form/Employee/{0}"">{0}</a> \ &#39;yı silin"
 DocType: Inpatient Occupancy,Check Out,Çıkış yapmak
 DocType: C-Form,Total Invoiced Amount,Toplam Faturalanmış Tutar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Minimum Miktar Maksimum Miktardan Fazla olamaz
@@ -6231,7 +6218,6 @@
 DocType: Cheque Print Template,Cheque Width,Çek Genişliği
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Satınalma Oranı veya Değerleme Oranı karşı Öğe için Satış Fiyatı doğrulamak
 DocType: Fee Schedule,Fee Schedule,Ücret tarifesi
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Sütun Etiketleri:
 DocType: Bank Transaction,Settled,yerleşik
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
 DocType: Quality Feedback,Parameters,Parametreler
@@ -6962,6 +6948,7 @@
 DocType: Salary Component,Formula,formül
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seri #
 DocType: Material Request Plan Item,Required Quantity,Gerekli miktar
+DocType: Cash Flow Mapping Template,Template Name,Şablon adı
 DocType: Lab Test Template,Lab Test Template,Lab Test Şablonu
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Muhasebe Dönemi {0} ile örtüşüyor
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Satış hesabı
@@ -7032,7 +7019,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Tarihinde gibi
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Tarihinde gibi
 DocType: Additional Salary,HR,İK
 DocType: Course Enrollment,Enrollment Date,başvuru tarihi
 DocType: Healthcare Settings,Out Patient SMS Alerts,Out Hasta SMS Uyarıları
@@ -7103,7 +7090,6 @@
 DocType: Course Content,Quiz,bilgi yarışması
 DocType: Subscription,Trial Period End Date,Deneme Süresi Bitiş Tarihi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,{0} Yetkili değil {0} sınırı aşar
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Buradan veri girmeye başlayın:
 DocType: Serial No,Asset Status,Varlık Durumu
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Aşırı Boyutlu Kargo (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Restaurant Masası
@@ -7351,7 +7337,6 @@
 DocType: Contract,Party User,Parti Kullanıcısı
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,<b>{0}</b> için varlıklar oluşturulmadı. Varlığı manuel olarak oluşturmanız gerekir.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Gruplandırılmış &#39;Şirket&#39; ise lütfen şirket filtresini boş olarak ayarlayın.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Gönderme Tarihi gelecek tarih olamaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
 DocType: Loan Repayment,Interest Payable,Ödenecek faiz
@@ -7599,7 +7584,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Ortalama Oran
 DocType: Appointment,Appointment With,İle randevu
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ödeme Planındaki Toplam Ödeme Tutarı Grand / Rounded Total&#39;e eşit olmalıdır.
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Katılımı olarak işaretle <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","""Müşterinin tedarik ettiği kalem"" Değerleme oranına sahip olamaz."
 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,Genel Muhasebe uyarınca Banka Hesap bakiyesi
@@ -8356,7 +8340,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},{0} çalışanının maksimum fayda miktarı {1} değerini aşıyor
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Toplam ayrılan yapraklar dönemde gün daha vardır
 DocType: Linked Soil Analysis,Linked Soil Analysis,Bağlı Toprak Analizi
-DocType: Pricing Rule,Percentage,Yüzde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Ürün {0} bir stok ürünü olmalıdır
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,İlerleme Ambarlar&#39;da Standart Çalışma
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","{0} için program çakışıyor, çakışan yuvaları atladıktan sonra devam etmek istiyor musunuz?"
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 5a1b68a..8f66d87 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -168,12 +168,11 @@
 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 @@
 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.","Щоб дозволити перевибір платежів, оновіть &quot;Надлишки над оплатою&quot; в Налаштуваннях облікових записів або Елемент."
 DocType: Patient Appointment,Procedure,Процедура
 DocType: Accounts Settings,Use Custom Cash Flow Format,Використовуйте спеціальний формат потоку грошових потоків
@@ -989,7 +987,6 @@
 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 &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 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,Частота дихання
@@ -1148,7 +1145,6 @@
 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 &gt; Supplier Type,Постачальник&gt; Тип постачальника
 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,Пріоритет рівня обслуговування
@@ -1449,7 +1445,6 @@
 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} -&gt; {1}) not found for item: {2},Коефіцієнт конверсії UOM ({0} -&gt; {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.,Валютна біржа повинна бути застосована для покупки чи продажу.
@@ -1951,7 +1946,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Повернення (дебетова примітка)
 DocType: Workstation,Wages,Заробітна плата
 DocType: Asset Maintenance,Maintenance Manager Name,Ім&#39;я менеджера технічного обслуговування
-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......,Збирання записів ......
@@ -2654,7 +2648,6 @@
 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 &gt; Settings &gt; Naming Series,"Будь ласка, встановіть назву серії на {0} за допомогою пункту Налаштування&gt; Налаштування&gt; Іменування серії"
 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,Звичайне ім&#39;я
@@ -2821,7 +2814,6 @@
 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 &gt; HR Settings,"Будь ласка, налаштуйте Систему іменування співробітників у Людських ресурсах&gt; Налаштування HR"
 DocType: Shipping Rule Condition,From Value,Від вартості
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
 DocType: Loan,Repayment Method,спосіб погашення
@@ -4081,7 +4073,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Обов&#39;язково На
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Якщо встановлено прапорець, приховує та вимикає поле &quot;Закруглена сума&quot; у &quot;Заплатах&quot;"
 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 &gt; Numbering Series,Установіть серію нумерації для відвідування за допомогою пункту Налаштування&gt; Серія нумерації
 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,Отримати оновлення підписки
@@ -4688,7 +4679,6 @@
 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 &gt; Education Settings,"Будь ласка, налаштуйте систему іменування інструкторів у програмі Освіта&gt; Налаштування освіти"
 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,Склад за замовчуванням для повернення продажів
@@ -4961,7 +4951,6 @@
 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,Мінімальна Кількість Замовлення
@@ -4979,7 +4968,7 @@
 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}
@@ -5550,8 +5539,6 @@
 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: 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,Cess
 DocType: Quality Feedback,Parameters,Параметри
@@ -6445,6 +6431,7 @@
 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,ім&#39;я шаблону
 DocType: Lab Test Template,Lab Test Template,Шаблон Lab Test
 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,Рахунок продажів
@@ -6505,7 +6492,7 @@
 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
@@ -6571,7 +6558,6 @@
 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,Ресторанний стіл
@@ -6799,7 +6785,6 @@
 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',"Будь ласка, встановіть фільтр компанії порожнім, якщо група До є «Компанія»"
-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,Виплата відсотків
@@ -7036,7 +7021,6 @@
 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,Банк балансовий звіт за Головну книгу
@@ -7732,7 +7716,6 @@
 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,Зв&#39;язаний аналіз грунтів
-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} накладання, ви хочете продовжити після пропуску слотів, що перекриваються?"
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index f7f9b7d..0817286 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -165,11 +165,10 @@
 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,اکاؤنٹنٹ
@@ -240,7 +239,6 @@
 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.",اوور بلنگ کی اجازت دینے کے لئے ، اکاؤنٹس کی ترتیبات یا آئٹم میں &quot;اوور بلنگ الاؤنس&quot; کو اپ ڈیٹ کریں۔
 DocType: Patient Appointment,Procedure,طریقہ کار
 DocType: Accounts Settings,Use Custom Cash Flow Format,اپنی مرضی کیش فلو فارمیٹ استعمال کریں
@@ -967,7 +965,6 @@
 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 &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 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,سوزش کی شرح
@@ -1121,7 +1118,6 @@
 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 &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 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,خدمت کی سطح کی ترجیح
@@ -1419,7 +1415,6 @@
 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} -&gt; {1}) not found for item: {2},UOM کے تبادلوں کا عنصر ({0} -&gt; {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.,خریدنے یا فروخت کے لئے کرنسی ایکسچینج لازمی طور پر نافذ ہونا ضروری ہے.
@@ -1916,7 +1911,6 @@
 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......,ریکارڈز کی بازیافت ......
@@ -2762,7 +2756,6 @@
 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 &gt; HR Settings,برائے کرم انسانی وسائل&gt; 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,باز ادائیگی کا طریقہ
@@ -3981,7 +3974,6 @@
 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 &gt; Numbering Series,براہ کرم حاضری کے لئے نمبر بندی سیریز سیٹ اپ&gt; نمبرنگ سیریز کے ذریعے ترتیب دیں
 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,سبسکرائب کریں تازہ ترین معلومات
@@ -4577,7 +4569,6 @@
 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 &gt; Education Settings,براہ کرم تعلیم&gt; تعلیم کی ترتیبات میں انسٹرکٹر نام دینے کا نظام مرتب کریں
 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,ڈیفالٹ گودام برائے سیلز ریٹرن۔
@@ -4844,7 +4835,6 @@
 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,کم از کم منگوانے والی مقدار
@@ -4860,7 +4850,7 @@
 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}
@@ -5416,8 +5406,6 @@
 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,کل انوائس کی رقم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,کم از کم مقدار زیادہ سے زیادہ مقدار سے زیادہ نہیں ہو سکتا
@@ -5619,7 +5607,6 @@
 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,پیرامیٹرز
@@ -6290,6 +6277,7 @@
 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,کل وزن
@@ -6349,7 +6337,7 @@
 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,باہر مریض ایس ایم ایس الرٹ
@@ -6414,7 +6402,6 @@
 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,ریسٹورانٹ ٹیبل
@@ -6634,7 +6621,6 @@
 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,قابل ادائیگی سود
@@ -6868,7 +6854,6 @@
 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,جنرل لیجر کے مطابق بینک کا گوشوارہ توازن
@@ -7546,7 +7531,6 @@
 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/hr/doctype/leave_period/leave_period.js,Grant Leaves,گرانٹ پتے
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index f8b8ea6..c0d6c52 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Ishlar davom etmoqda
 DocType: Leave Control Panel,Branch (optional),Filial (ixtiyoriy)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,"Iltimos, tarixni tanlang"
-DocType: Item Price,Minimum Qty ,Minimal Miqdor
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimal Miqdor
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM takrorlanishi: {0} {1} bolasi bo&#39;la olmaydi.
 DocType: Finance Book,Finance Book,Moliya kitobi
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Dam olish ro&#39;yxati
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,{0} ona hisobi mavjud emas
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Sharh va harakat
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ushbu xodim allaqachon bir xil vaqt belgisi bilan jurnalga ega. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Hisobchi
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Daromad / yo&#39;qotish
 DocType: Crop,Perennial,Ko&#39;p yillik
 DocType: Program,Is Published,Nashr qilingan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Yetkazib berish eslatmalarini ko&#39;rsatish
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",Hisob-kitob orqali ortiqcha to&#39;lovni amalga oshirishga ruxsat berish uchun Hisoblar sozlamalari yoki bandidagi &quot;To&#39;lovdan ortiq ruxsatnoma&quot; ni yangilang.
 DocType: Patient Appointment,Procedure,Protsedura
 DocType: Accounts Settings,Use Custom Cash Flow Format,Maxsus pul oqimi formatini ishlatish
@@ -980,7 +978,6 @@
 DocType: Patient,Risk Factors,Xavf omillari
 DocType: Patient,Occupational Hazards and Environmental Factors,Kasbiy xavf va atrof-muhit omillari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Ish tartibi uchun allaqachon yaratilgan aktsion yozuvlar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Element kodi&gt; Mahsulotlar guruhi&gt; Tovar
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,O&#39;tgan buyurtmalarga qarang
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} suhbatlar
 DocType: Vital Signs,Respiratory rate,Nafas olish darajasi
@@ -1136,7 +1133,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Yangilash jarayonida xatolik yuz berdi
 DocType: Restaurant Reservation,Restaurant Reservation,Restoran rezervasyoni
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Sizning narsalaringiz
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Ta&#39;minotchi&gt; Ta&#39;minotchi turi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Takliflarni Yozish
 DocType: Payment Entry Deduction,Payment Entry Deduction,To&#39;lovni to&#39;lashni kamaytirish
 DocType: Service Level Priority,Service Level Priority,Xizmat darajasi ustuvorligi
@@ -1435,7 +1431,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Yozuvlar olish uchun Kompaniya va Xabar yuborish tarixini tanlang
 DocType: Asset,Maintenance,Xizmat
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Bemor uchrashuvidan oling
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversiyalash koeffitsienti ({0} -&gt; {1}) quyidagi element uchun topilmadi: {2}
 DocType: Subscriber,Subscriber,Abonent
 DocType: Item Attribute Value,Item Attribute Value,Mavzu xususiyati qiymati
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valyuta almashinuvi xarid yoki sotish uchun tegishli bo&#39;lishi kerak.
@@ -1933,7 +1928,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Qaytish (debit)
 DocType: Workstation,Wages,Ish haqi
 DocType: Asset Maintenance,Maintenance Manager Name,Xizmat menejeri nomi
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Kompaniyaga qarshi bitimlar allaqachon mavjud!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Saytni talab qilish
 DocType: Agriculture Task,Urgent,Shoshilinch
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Yozuvlarni yuklash ......
@@ -2628,7 +2622,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,"{0} qatoridagi to&#39;lov muddati, ehtimol, ikki nusxadir."
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Qishloq xo&#39;jaligi (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Qoplamali sumkasi
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, sozlash&gt; Sozlamalar&gt; Nomlash seriyalari orqali {0} uchun nomlash seriyasini o&#39;rnating"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Ofis ijarasi
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,SMS-gateway sozlamalarini to&#39;g&#39;rilash
 DocType: Disease,Common Name,Umumiy nom
@@ -2794,7 +2787,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},{0} uchun muvaffaqiyatli tarzda ajratilgan qoldirilganlar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,To&#39;plam uchun hech narsa yo&#39;q
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Hozirda faqat .csv va .xlsx fayllari ishlaydi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari&gt; Kadrlar sozlamalarida o&#39;rnating"
 DocType: Shipping Rule Condition,From Value,Qiymatdan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Ishlab chiqarish miqdori majburiydir
 DocType: Loan,Repayment Method,Qaytarilish usuli
@@ -4039,7 +4031,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Majburiy On
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Agar belgilansa, &quot;Ish haqi&quot; dagi &quot;yuvarlatilgan&quot; maydonini yashiradi va o&#39;chiradi"
 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.,Bu Sotish Buyurtmalarida etkazib berish sanasi uchun odatiy hisob-kitob (kunlar). Qayta tiklash qiymati buyurtma berilgan kundan boshlab 7 kun.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Iltimos Setup&gt; Raqamlash seriyalari orqali qatnashish uchun raqamlash seriyasini sozlang
 DocType: Rename Tool,File to Rename,Qayta nomlash uchun fayl
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},"Iltimos, Row {0} qatori uchun BOM-ni tanlang"
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Obunani yangilang
@@ -4640,7 +4631,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Moliya narximi?
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Xodimga ({0} davomi allaqachon belgilangan
 DocType: Packing Slip,If more than one package of the same type (for print),Agar bir xil turdagi bir nechta paketi (chop etish uchun)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Iltimos, Ta&#39;lim beruvchiga nom berish tizimini Ta&#39;lim sozlamalarida o&#39;rnating"
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Restoran sozlamalarida standart mijozni tanlang
 ,Salary Register,Ish haqi registrati
 DocType: Company,Default warehouse for Sales Return,Sotishni qaytarish uchun odatiy ombor
@@ -4911,7 +4901,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Kutilayotgan amallar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Laboratoriya testini yaratish
 DocType: Patient Appointment,Reminded,Eslatildi
-DocType: Homepage Section,Cards,Kartalar
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Hisob jadvalini ko&#39;ring
 DocType: Chapter Member,Chapter Member,Bo&#39;lim a&#39;zosi
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimal buyurtma miqdori
@@ -4929,7 +4918,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Kelgusi sanalar ruxsat etilmaydi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Kutilayotgan etkazib berish sanasi Sotuvdagi Buyurtma tarixidan keyin bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Tartibni qayta tartibga solish
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Hisob jadvalining jadvali
+DocType: Company,Chart Of Accounts Template,Hisob jadvalining jadvali
 DocType: Attendance,Attendance Date,Ishtirok etish sanasi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Yangilangan aktsiyalarni sotib olish uchun taqdim etgan {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Narxlar ro&#39;yxatida {1} uchun {0} uchun mahsulot narxi yangilandi.
@@ -5494,8 +5483,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Ledgerni ulashing
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Savdo shaxsi {0} yaratildi
 DocType: Employee,Confirmation Date,Tasdiqlash sanasi
-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","Ushbu hujjatni bekor qilish uchun <a href=""#Form/Employee/{0}"">{0}</a> \ xodimini o&#39;chiring"
 DocType: Inpatient Occupancy,Check Out,Tekshirib ko&#39;rmoq
 DocType: C-Form,Total Invoiced Amount,Umumiy hisobdagi mablag &#39;
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Kty Maksimum kattaridan kattaroq bo&#39;la olmaydi
@@ -5702,7 +5689,6 @@
 DocType: Cheque Print Template,Cheque Width,Kenglikni tekshiring
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Buyurtma narxidan yoki baholash bahosidan sotish narxini tasdiqlash
 DocType: Fee Schedule,Fee Schedule,Ish haqi jadvali
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Ustun yorliqlari:
 DocType: Bank Transaction,Settled,O&#39;rnatilgan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Sessiya
 DocType: Quality Feedback,Parameters,Parametrlar
@@ -6375,6 +6361,7 @@
 DocType: Salary Component,Formula,Formulalar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seriya #
 DocType: Material Request Plan Item,Required Quantity,Kerakli miqdori
+DocType: Cash Flow Mapping Template,Template Name,Andoza nomi
 DocType: Lab Test Template,Lab Test Template,Laboratoriya viktorina namunasi
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Hisob-kitob davri {0} bilan mos keladi
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Savdo hisobi
@@ -6435,7 +6422,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Tekshirish sanasi
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Hisob {0}: Ota-hisob {1} kompaniyaga tegishli emas: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Ushbu kompaniya bilan bog&#39;liq barcha operatsiyalar muvaffaqiyatli o&#39;chirildi!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Sana Sana bo&#39;yicha
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Sana Sana bo&#39;yicha
 DocType: Additional Salary,HR,HR
 DocType: Course Enrollment,Enrollment Date,Ro&#39;yxatga olish sanasi
 DocType: Healthcare Settings,Out Patient SMS Alerts,Kasal SMS-ogohlantirishlari
@@ -6501,7 +6488,6 @@
 DocType: Course Content,Quiz,Viktorina
 DocType: Subscription,Trial Period End Date,Sinov muddati tugash sanasi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,{0} dan boshlab authroized emas
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Bu yerdan ma&#39;lumotlarni kiritishni boshlang:
 DocType: Serial No,Asset Status,Aktivlar holati
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Hajmdagi yuk (ODK)
 DocType: Restaurant Order Entry,Restaurant Table,Restoran jadvalidan
@@ -6727,7 +6713,6 @@
 DocType: Contract,Party User,Partiya foydalanuvchisi
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,<b>{0}</b> uchun obyektlar yaratilmagan. Siz aktivlarni qo&#39;lda yaratishingiz kerak.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Guruh tomonidan &quot;Kompaniya&quot; bo&#39;lsa, Kompaniya filtrini bo&#39;sh qoldiring."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Hudud
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Kiritilgan sana kelajakdagi sana bo&#39;la olmaydi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},# {0} qatori: ketma-ket No {1} {2} {3}
 DocType: Loan Repayment,Interest Payable,To&#39;lanadigan foizlar
@@ -6962,7 +6947,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,O&#39;rtacha narx
 DocType: Appointment,Appointment With,Uchrashuv bilan
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,To&#39;lov tarifidagi umumiy to&#39;lov miqdori Grand / Rounded Totalga teng bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Davomi sifatida belgilang <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Buyurtmachiga taqdim etilgan mahsulot&quot; baho qiymatiga ega bo&#39;lolmaydi
 DocType: Subscription Plan Detail,Plan,Reja
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bank Bosh balansidagi balans balansi
@@ -7653,7 +7637,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Xodimning {0} maksimal foyda miqdori {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Jami ajratilgan barglar davr ichida kundan ortiq
 DocType: Linked Soil Analysis,Linked Soil Analysis,Bog&#39;langan tuproq tahlillari
-DocType: Pricing Rule,Percentage,Foiz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,{0} elementi birja elementi bo&#39;lishi kerak
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standart ishni bajarishda ombor
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","{0} uchun jadvallar bir-biri bilan chalkashtirilsa, ketma-ket qoplangan pog&#39;onalarni skripka qilgandan keyin davom etmoqchimisiz?"
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 2bed8e9..25199b7 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -168,12 +168,11 @@
 DocType: Work Order Operation,Work In Progress,Đang trong tiến độ hoàn thành
 DocType: Leave Control Panel,Branch (optional),Chi nhánh (tùy chọn)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Vui lòng chọn ngày
-DocType: Item Price,Minimum Qty ,Số lượng tối thiểu
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Số lượng tối thiểu
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Đệ quy BOM: {0} không thể là con của {1}
 DocType: Finance Book,Finance Book,Sách Tài chính
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
 DocType: Appointment Booking Settings,Holiday List,Danh sách kỳ nghỉ
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Tài khoản mẹ {0} không tồn tại
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Đánh giá và hành động
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Nhân viên này đã có một nhật ký với cùng dấu thời gian. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Kế toán viên
@@ -245,7 +244,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,Mất lợi
 DocType: Crop,Perennial,Lâu năm
 DocType: Program,Is Published,Được công bố
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Hiển thị ghi chú giao hàng
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Để cho phép thanh toán quá mức, hãy cập nhật &quot;Trợ cấp thanh toán quá mức&quot; trong Cài đặt tài khoản hoặc Mục."
 DocType: Patient Appointment,Procedure,Thủ tục
 DocType: Accounts Settings,Use Custom Cash Flow Format,Sử dụng Định dạng Tiền mặt Tuỳ chỉnh
@@ -988,7 +986,6 @@
 DocType: Patient,Risk Factors,Các yếu tố rủi ro
 DocType: Patient,Occupational Hazards and Environmental Factors,Các nguy cơ nghề nghiệp và các yếu tố môi trường
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Mục hàng đã được tạo cho Đơn hàng công việc
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm vật phẩm&gt; Thương hiệu
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Xem đơn đặt hàng trước
 apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} cuộc hội thoại
 DocType: Vital Signs,Respiratory rate,Tỉ lệ hô hấp
@@ -1147,7 +1144,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Đã xảy ra lỗi trong quá trình cập nhật
 DocType: Restaurant Reservation,Restaurant Reservation,Đặt phòng khách sạn
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Những hạng mục của bạn
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Đề nghị Viết
 DocType: Payment Entry Deduction,Payment Entry Deduction,Bút toán thanh toán khấu trừ
 DocType: Service Level Priority,Service Level Priority,Ưu tiên cấp độ dịch vụ
@@ -1450,7 +1446,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Vui lòng chọn Công ty và Ngày đăng để nhận các mục nhập
 DocType: Asset,Maintenance,Bảo trì
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Nhận từ Bệnh nhân gặp
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Không tìm thấy yếu tố chuyển đổi UOM ({0} -&gt; {1}) cho mục: {2}
 DocType: Subscriber,Subscriber,Người đăng kí
 DocType: Item Attribute Value,Item Attribute Value,GIá trị thuộc tính mẫu hàng
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Trao đổi tiền tệ phải được áp dụng cho việc mua hoặc bán.
@@ -1952,7 +1947,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),Trả lại (Ghi nợ)
 DocType: Workstation,Wages,Tiền lương
 DocType: Asset Maintenance,Maintenance Manager Name,Tên quản lý bảo trì
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Giao dịch chống lại công ty đã tồn tại!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Trang web yêu cầu
 DocType: Agriculture Task,Urgent,Khẩn cấp
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Lấy hồ sơ ......
@@ -2655,7 +2649,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Thời hạn thanh toán ở hàng {0} có thể trùng lặp.
 apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Nông nghiệp (beta)
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Bảng đóng gói
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Sê-ri đặt tên cho {0} qua Cài đặt&gt; Cài đặt&gt; Sê-ri đặt tên
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
 DocType: Disease,Common Name,Tên gọi chung
@@ -2825,7 +2818,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Các di dời  được phân bổ thành công cho {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Không có mẫu hàng để đóng gói
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Hiện tại chỉ có các tệp .csv và .xlsx được hỗ trợ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng thiết lập Hệ thống đặt tên nhân viên trong Nhân sự&gt; Cài đặt nhân sự
 DocType: Shipping Rule Condition,From Value,Từ giá trị gia tăng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
 DocType: Loan,Repayment Method,Phương pháp trả nợ
@@ -4086,7 +4078,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Đã yêu cầu với
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Nếu được chọn, ẩn và vô hiệu hóa trường Tổng số được làm tròn trong Bảng lương"
 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.,Đây là phần bù mặc định (ngày) cho Ngày giao hàng trong Đơn đặt hàng. Thời gian bù dự phòng là 7 ngày kể từ ngày đặt hàng.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số cho Tham dự thông qua Cài đặt&gt; Sê-ri đánh số
 DocType: Rename Tool,File to Rename,Đổi tên tệp tin
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Tìm nạp cập nhật đăng ký
@@ -4706,7 +4697,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,Chi phí Tài chính
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
 DocType: Packing Slip,If more than one package of the same type (for print),Nếu có nhiều hơn một gói cùng loại (đối với in)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống đặt tên giảng viên trong giáo dục&gt; Cài đặt giáo dục
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Vui lòng đặt khách hàng mặc định trong Cài đặt nhà hàng
 ,Salary Register,Mức lương Đăng ký
 DocType: Company,Default warehouse for Sales Return,Kho mặc định cho doanh thu bán hàng
@@ -4979,7 +4969,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Các hoạt động cấp phát
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Tạo thử nghiệm Lab
 DocType: Patient Appointment,Reminded,Được nhắc nhở
-DocType: Homepage Section,Cards,thẻ
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Xem biểu đồ tài khoản
 DocType: Chapter Member,Chapter Member,Thành viên của Chương
 DocType: Material Request Plan Item,Minimum Order Quantity,Số lượng đặt hàng tối thiểu
@@ -4997,7 +4986,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Các ngày trong tương lai không được phép
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Ngày giao hàng dự kiến sẽ là sau Ngày đặt hàng bán hàng
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Sắp xếp lại Cấp
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Chart of Accounts Template
+DocType: Company,Chart Of Accounts Template,Chart of Accounts Template
 DocType: Attendance,Attendance Date,Ngày có mặt
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Cập nhật chứng khoán phải được bật cho hóa đơn mua hàng {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Giá mẫu hàng cập nhật cho {0} trong Danh sách  {1}
@@ -5568,8 +5557,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Chia sẻ sổ cái
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Hóa đơn bán hàng {0} đã được tạo
 DocType: Employee,Confirmation Date,Ngày Xác nhậ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","Vui lòng xóa Nhân viên <a href=""#Form/Employee/{0}"">{0}</a> \ để hủy tài liệu này"
 DocType: Inpatient Occupancy,Check Out,Kiểm tra
 DocType: C-Form,Total Invoiced Amount,Tổng số tiền đã lập Hoá đơn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Số lượng tối thiểu không thể lớn hơn Số lượng tối đa
@@ -5778,7 +5765,6 @@
 DocType: Cheque Print Template,Cheque Width,Chiều rộng Séc
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Hợp thức hóa giá bán hàng cho mẫu hàng với tỷ giá mua bán hoặc tỷ giá định giá
 DocType: Fee Schedule,Fee Schedule,Biểu phí
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Nhãn cột:
 DocType: Bank Transaction,Settled,Định cư
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Tạm dừng
 DocType: Quality Feedback,Parameters,Thông số
@@ -6462,6 +6448,7 @@
 DocType: Salary Component,Formula,Công thức
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
 DocType: Material Request Plan Item,Required Quantity,Số lượng yêu cầu
+DocType: Cash Flow Mapping Template,Template Name,Tên mẫu
 DocType: Lab Test Template,Lab Test Template,Mẫu thử nghiệm Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Kỳ kế toán trùng lặp với {0}
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Tài khoản bán hàng
@@ -6522,7 +6509,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: tài khoản mẹ {1} không thuộc về công ty: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Xóa thành công tất cả các giao dịch liên quan đến công ty này!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,vào ngày
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,vào ngày
 DocType: Additional Salary,HR,nhân sự
 DocType: Course Enrollment,Enrollment Date,ngày đăng ký
 DocType: Healthcare Settings,Out Patient SMS Alerts,Thông báo qua SMS của bệnh nhân
@@ -6588,7 +6575,6 @@
 DocType: Course Content,Quiz,Đố
 DocType: Subscription,Trial Period End Date,Ngày kết thúc giai đoạn dùng thử
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Không được phép từ {0} vượt qua các giới hạn
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Bắt đầu nhập dữ liệu từ đây:
 DocType: Serial No,Asset Status,Trạng thái nội dung
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),Hàng hóa theo chiều (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,Bàn ăn
@@ -6816,7 +6802,6 @@
 DocType: Contract,Party User,Người dùng bên
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Tài sản không được tạo cho <b>{0}</b> . Bạn sẽ phải tạo tài sản bằng tay.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Vui lòng đặt Bộ lọc của Công ty trống nếu Nhóm theo là &#39;Công ty&#39;
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Viết bài ngày không thể ngày trong tương lai
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Hàng # {0}: Số sê ri{1} không phù hợp với {2} {3}
 DocType: Loan Repayment,Interest Payable,Phải trả lãi
@@ -7053,7 +7038,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Tỷ lệ trung bình
 DocType: Appointment,Appointment With,Bổ nhiệm với
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Tổng số tiền thanh toán trong lịch thanh toán phải bằng tổng số tiền lớn / tròn
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Đánh dấu tham dự như <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;Mục khách hàng cung cấp&quot; không thể có Tỷ lệ định giá
 DocType: Subscription Plan Detail,Plan,Kế hoạch
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Báo cáo số dư ngân hàng theo Sổ cái tổng
@@ -7750,7 +7734,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Số tiền lợi ích tối đa của nhân viên {0} vượt quá {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Tổng số di dời được giao rất nhiều so với những ngày trong kỳ
 DocType: Linked Soil Analysis,Linked Soil Analysis,Phân tích đất kết hợp
-DocType: Pricing Rule,Percentage,Tỷ lệ phần trăm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Mục {0} phải là một hàng tồn kho
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kho SP dở dang mặc định
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Lịch biểu cho {0} trùng lặp, bạn có muốn tiếp tục sau khi bỏ qua các vùng chồng chéo không?"
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 847a936..457ed3c 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -168,12 +168,11 @@
 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 @@
 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,使用自定义现金流量格式
@@ -989,7 +987,6 @@
 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 &gt; Item Group &gt; Brand,物料代码&gt;物料组&gt;品牌
 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,呼吸频率
@@ -1148,7 +1145,6 @@
 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 &gt; Supplier Type,供应商&gt;供应商类型
 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,服务水平优先
@@ -1449,7 +1445,6 @@
 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} -&gt; {1}) not found for item: {2},找不到项目{2}的UOM转换因子（{0}-&gt; {1}）
 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.,外币汇率必须适用于买入或卖出。
@@ -1961,7 +1956,6 @@
 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......,获取记录中......
@@ -2663,7 +2657,6 @@
 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 &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{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,通用名称
@@ -2830,7 +2823,6 @@
 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 &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,生产数量为必须项
 DocType: Loan,Repayment Method,还款方式
@@ -4089,7 +4081,6 @@
 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 &gt; Numbering Series,请通过“设置”&gt;“编号序列”为出勤设置编号序列
 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,获取订阅更新
@@ -4707,7 +4698,6 @@
 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 &gt; Education Settings,请在“教育”&gt;“教育设置”中设置教师命名系统
 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,销售退货的默认仓库
@@ -4980,7 +4970,6 @@
 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,最小起订量
@@ -4998,7 +4987,7 @@
 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}中了，之后的订单会使用新价格
@@ -5567,8 +5556,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,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,最小数量不能大于最大数量
@@ -5777,7 +5764,6 @@
 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,参数
@@ -6461,6 +6447,7 @@
 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,销售科目
@@ -6521,7 +6508,7 @@
 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,不住院病人短信
@@ -6587,7 +6574,6 @@
 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,餐桌
@@ -6815,7 +6801,6 @@
 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',如果按什么分组是“Company”，请设置公司过滤器空白
-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,应付利息
@@ -7052,7 +7037,6 @@
 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","""Customer Provided Item（客户提供的物品）"" 不允许拥有 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,基于总帐的银行对账单余额
@@ -7748,7 +7732,6 @@
 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}计划任务重叠，是否要在滑动重叠的插槽后继续？
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index 83feb78..9734218 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -148,11 +148,10 @@
 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: 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,會計人員
@@ -215,7 +214,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pension Funds,養老基金
 DocType: Exchange Rate Revaluation Account,Gain/Loss,收益/損失
 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: Accounts Settings,Use Custom Cash Flow Format,使用自定義現金流量格式
 DocType: SMS Center,All Sales Person,所有的銷售人員
@@ -902,7 +900,6 @@
 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 &gt; Item Group &gt; Brand,物料代碼&gt;物料組&gt;品牌
 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,呼吸頻率
@@ -1045,7 +1042,6 @@
 apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉，報銷和工資
 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/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 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,服務水平優先
@@ -1318,7 +1314,6 @@
 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} -&gt; {1}) not found for item: {2},找不到項目{2}的UOM轉換因子（{0}-&gt; {1}）
 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.,貨幣兌換必須適用於買入或賣出。
@@ -1797,7 +1792,6 @@
 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......,獲取記錄......
@@ -2435,7 +2429,6 @@
 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 &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{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,通用名稱
@@ -2586,7 +2579,6 @@
 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 &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Shipping Rule Condition,From Value,從價值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,生產數量是必填的
 DocType: Loan,Repayment Method,還款方式
@@ -3735,7 +3727,6 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
 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 &gt; Numbering Series,請通過“設置”&gt;“編號序列”為出勤設置編號序列
 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,獲取訂閱更新
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
@@ -4329,7 +4320,6 @@
 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 &gt; Education Settings,請在“教育”&gt;“教育設置”中設置教師命名系統
 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,銷售退貨的默認倉庫
@@ -4601,7 +4591,7 @@
 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,圖表帳戶模板
 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}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Number Created,序列號已創建
@@ -5132,8 +5122,6 @@
 DocType: Installation Note,Installation Date,安裝日期
 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,最小數量不能大於最大數量
@@ -5326,7 +5314,6 @@
 DocType: Cheque Print Template,Cheque Width,支票寬度
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,驗證售價反對預訂價或估價RATE項目
 DocType: Fee Schedule,Fee Schedule,收費表
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,列標籤：
 DocType: Quality Feedback,Parameters,參數
 DocType: Company,Create Chart Of Accounts Based On,創建圖表的帳戶根據
 apps/erpnext/erpnext/education/doctype/student/student.py,Date of Birth cannot be greater than today.,出生日期不能大於今天。
@@ -5954,6 +5941,7 @@
 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,銷售帳戶
@@ -6009,7 +5997,7 @@
 ,BOM Items and Scraps,物料清單物料和廢料
 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: Course Enrollment,Enrollment Date,報名日期
 DocType: Healthcare Settings,Out Patient SMS Alerts,輸出病人短信
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Probation,緩刑
@@ -6070,7 +6058,6 @@
 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: Hotel Room,Hotel Manager,酒店經理
@@ -6282,7 +6269,6 @@
 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是“Company”，請設置公司過濾器空白
-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,應付利息
@@ -6496,7 +6482,6 @@
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Period Start Date and Trial Period End Date must be set,必須設置試用期開始日期和試用期結束日期
 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,銀行對賬單餘額按總帳
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 2099810..f88ffd4 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -5,7 +5,7 @@
 import frappe
 import frappe.share
 from frappe import _
-from frappe.utils import cstr, now_datetime, cint, flt, get_time
+from frappe.utils import cstr, now_datetime, cint, flt, get_time, get_link_to_form
 from erpnext.controllers.status_updater import StatusUpdater
 
 from six import string_types
@@ -123,8 +123,11 @@
 					ref_rate = frappe.db.get_value(ref_dt + " Item", d.get(ref_link_field), "rate")
 
 					if abs(flt(d.rate - ref_rate, d.precision("rate"))) >= .01:
-						frappe.throw(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
+						frappe.msgprint(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
 							.format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate))
+						frappe.throw(_("To allow different rates, disable the {0} checkbox in {1}.")
+							.format(frappe.bold("Maintain Same Rate Throughout Sales Cycle"), 
+							get_link_to_form("Selling Settings", "Selling Settings", frappe.bold("Selling Settings"))))
 
 	def get_link_filters(self, for_doctype):
 		if hasattr(self, "prev_link_mapper") and self.prev_link_mapper.get(for_doctype):